Merge origin/master

Conflicts:
	web/META-INF/context.xml
Merge origin/master
Ultima version xD
Merge origin/master