no message
Merge branch 'develop' of http://192.168.10.23:7990/scm/yin/basic into develop

Conflicts:
	protected/backend/runtime/application.log
	protected/runtime/application.log