a log
Merge remote-tracking branch 'doudou/master'

Conflicts:
	protected/runtime/application.log