.
Merge branch 'master' of https://github.com/Innoto/cogumelo

Conflicts:
	c_packages/base_app/c_app/classes/view/MasterView.php
	c_packages/base_app/c_app/classes/view/templates/default.tpl