BUG
Merge remote-tracking branch 'origin/master'

Conflicts:
	example/tutorial_cnblogs/asserts/scripts/cnblogs.client.js
Merge branch 'master' of https://github.com/leewind/dalmatians
增加demo，测试app，初步测试通过，暂时解锁我那两个方法