some
Merge remote-tracking branch 'origin/master'

Conflicts:
	Application/Home/Conf/config.php
	Application/Home/Controller/LoginController.class.php
	Application/Home/View/Login/index.html
	Application/Runtime/Cache/Home/2a94b8bda04ff446dcedd42276fc99ee.php
	Application/Runtime/Cache/Home/5b6adcb62ad2b5dfc2abc2cd5e11dc99.php
	Application/Runtime/Logs/14_05_07.log