cleanup dependencies
Merge branch 'master' into openshift

Conflicts:
	package.json
jshint cleanup
Merge branch 'master' into openshift