added routes
added routes
Merge branch 'develop' of https://github.com/Largaroth/MyScrum into develop

Conflicts:
	app/controllers/api.rb