ignore
Merge branch 'master' of https://github.com/wuxinchaliu/915

Conflicts:
	protected/runtime/application.log
d
commit ignore
develop
admin -v2