merging
merging
Merge branch 'master' of https://github.com/anhvupham/fqtd

Conflicts:
	fqtd/fqtd/Scripts/utils.js