Merge origin/master

Conflicts:
	engine/imagebattles.php