Cambios -lg
Merge branch 'master' of https://github.com/aito0077/coperable

Conflicts:
	coperable-site/public/css/styles.less
	coperable-site/views/layout.html