a
Merge branch 'master' of https://github.com/anhntk54/giaingoaihang

Conflicts:
	protected/runtime/application.log