Merge origin/master

Conflicts:
	Sistema/nbproject/project.properties
	Sistema/public_html/index.html
Login
Merge origin/master

Conflicts:
	Sistema/public_html/index.html
	Sistema/public_html/session/principal.html
Merge origin/master

Conflicts:
	Sistema/public_html/session/principal.html