rollback
Merge branch 'master' of https://github.com/thanh4890/ndt_starter

Conflicts:
	framework/js/readme.txt