sua mot so cho
Merge branch 'master' of https://github.com/tungvn/thesis

Conflicts:
	js/layer.js