21-4-2014
Merge branch 'master' of https://github.com/anhntk54/giaingoaihang

Conflicts:
	backend/protected/runtime/application.log