merge
Merge branch 'master' of github.com:descala/haltr

Conflicts:
	app/views/companies/_my_company.html.erb
idiomes perfils
Merge branch 'master' of github.com:descala/haltr
Merge pull request #51 from oriol/master

Traducció a idiomes pels perfils