services api
Merge branch 'master' of https://github.com/malavbhavsar/mitra

Conflicts:
	server/config/routes.rb