Bundle update
Update Resource companies
Update locales
Update Resource Users
Merge branch 'master' of https://github.com/nicolas-brousse/invoicer

Conflicts:
	app/helpers/users_helper.rb
Debug