removed node modules
cleanup
Merge branch 'master' into gh-pages

Conflicts:
	oscApp.js
fixed merge issue
Merge branch 'gh-pages'