Merge origin/master

Conflicts:
	Application/Home/Controller/IndexController.class.php