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

Conflicts:
	c_packages/base_app/cogumelo
bower