fix gulp tasks, include js correctly, reinstall npm modules
Merge branch 'master' into HEAD