Translate helper jonge
Merge branch 'master' of https://github.com/nyabb/poc

Conflicts:
	app/controllers/dashboard_controller.rb