Signed-off-by: Rgss <rgsser@gmail.com>
Merge branch 'master' of github.com:Rgss/Qphp

Conflicts:
	Application/Common/Function.php
	Application/Modules/Post/Controllers/PostController.php
	Application/Modules/User/Controllers/UserController.php
	Framework/Data/Log/2013/12/30.log
	Public/css/bootstrap.css
	Public/css/style.css

Signed-off-by: Rgss <rgsser@gmail.com>