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
Merge origin/master into development

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

Merge origin/master into development
Merge pull request #4 from chinaqishuai/master

Test
Merge pull request #1 from TrojanBox/master

bug fixed