ngay 21/10
update
Merge branch 'master' of http://github.com/hoangsu/Homezone

Conflicts:
	.gitignore