slide
gágds
gsdgsdgsd
Merge http://github.com/anhntk54/giaingoaihang

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