Change version of pheonix so that it does not conflict with Erlang 1.9, and fix test#123

tomfbiz wants to merge 7 commits into

trenpixster:mastertrenpixster/addict:masterfrom

tomfbiz:phoenix.1.2tomfbiz/addict:phoenix.1.2Copy head branch name to clipboard