Merge origin/master

Conflicts:
	app/core/config.php
	index.php
	simpop/config.php
Merge origin/master

Conflicts:
	app/core/config.php
	index.php
	simpop/config.php