debug
Merge branch 'master' of https://github.com/yanpeipan/giter

Conflicts:
	config.php
	protected/config/db.php
	protected/runtime/application.log
	protected/runtime/application.log.1
	protected/runtime/application.log.2
	protected/runtime/application.log.3
	protected/runtime/application.log.4
	protected/runtime/application.log.5