Working on jshint warnings.
Merge branch 'master' of https://github.com/jzkung/dashboard

Conflicts:
	.jshintrc