services and pay ways are done
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/assets/javascripts/ember/routes/translator_individual_edit_route.js.coffee