removed comments

removed comments
Merge branch 'John' and fix conflicts in min.'s

Conflicts:
	js/main.js

Removed a few hundred lines of comments