Adding JSCS testing and fixing issues
Merge branch 'master' into jscs

Conflicts:
	app/src/util.js
Merge pull request #55 from tangelo-hub/jscs

Adding JSCS testing and fixing issues