change api url
Merge branch 'dev' into feature/tony

Conflicts:
	app/assets/javascripts/ng-app/app.js
	app/assets/javascripts/ng-app/controllers/agenda.js
change api url