Merge branch 'master' of github.com:kolaborativa/redekolaborativa
Merge branch 'landing-page-home' of github.com:kolaborativa/redekolaborativa
frontend
Merge branch 'landing-page-home' of github.com:kolaborativa/redekolaborativa
frontend index corriged
login working on the new layout
register working on the new layout
Merge branch 'index' into nightly

Conflicts:
	views/default/principal.html