added translations
Merge remote-tracking branch 'origin/model_controller_coordination' into model_controller_coordination
May broke everything....sry
Conflicts:
	config/routes.rb