wigget cau hoi
Merge branch 'master' of https://github.com/anhntk54/duan1

Conflicts:
	protected/runtime/application.log