Daily commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	classes/class.fConst.php
	classes/class.galaxy.php
	classes/class.galaxyTemplate.php
	classes/class.planet.php
	classes/class.system.php
	classes/class.universe.php
	classes/class.utils.php