Lint
Linted
Merge branch 'develop' into optimize

Conflicts:
	app/scripts/app.js