* Fixed company name
* Fixed public user page
Merge branch 'master' of https://github.com/tiagopais/swsantiago

Conflicts:
	commons/templates/base.html