Merge
merge2
Merge branch 'master' of https://github.com/haxakl/tp2webmiage

Conflicts:
	dist/tp2webmiage.war