Merge origin/master

Conflicts:
	Application/Home/Controller/IndexController.class.php
Merge origin/master into development

Conflicts:
	Application/Home/Controller/IndexController.class.php
Merge origin/master into development

Conflicts:
	Application/Home/Controller/IndexController.class.php
Merge origin/development into development
Merge pull request #1 from TrojanBox/development

Development