Ajustes: active, login, header, links
Merge branch 'develop' into phonegap

Conflicts:
	sass/_app.scss
	sass/_base.scss