Avances en navbar
Merge branch 'master' of https://github.com/oyamba/hogarisma

Conflicts:
	resources/css/style.css