add phases challenge
Merge branch 'master' into phases_api

Conflicts:
	actions/challenges.js
Merge branch 'master' into phases_api

Conflicts:
	actions/challenges.js
	routes.js
Merge pull request #217 from LazyChild/phases_api

Add phases api