Merge pull request #1 from MarioASM/html5

Html5
Merge pull request #2 from MarioASM/html5

Html5
Merge pull request #3 from MarioASM/html5

Html5
Merge pull request #4 from MarioASM/html5

ultimo merge con servlet login listo
twitter
cambio menor
Merge pull request #5 from MarioASM/html5

Html5
Merge remote-tracking branch 'origin/html5'

Conflicts:
	src/java/com/ServletSaam/Mlogin.java
correcciones en clase de login

añdi correccines diversas
Merge branch 'master' into html5