la ultima modificación de Jeanco! =)
Merge branch 'master' of https://github.com/EsisDevelopers/ESIS

Conflicts:
	app/views/layouts/_navigation.html.erb