wangnan commit
Merge branch 'master' of https://github.com/ausdauernd/nnkzdb

Conflicts:
	nnkzdb/app/controllers/app_controller.php