xong chua
end
Merge branch 'master' of https://github.com/behaiha/vatthela

Conflicts:
	backend/protected/runtime/application.log