Changes from code review with TFU and JS Linting fixes
Merge branch 'master' of https://github.com/RustyRomeo/CloneIT

Conflicts:
	app/scripts/main.js