test fix
Merge branch 'master' of https://github.com/felipetmartini/ComodatoSite

Conflicts:
	guildwar.php