checkpoint
Kerge branch 'master' of https://github.com/bangvndng/newhospitality

Conflicts:
	temporary/log/main.log
	temporary/log/tasks.log
	temporary/log/translate.log