Cleaned up more code and fixed some cookie monsters.
Removed lots of unimportant code/lines
Merge remote-tracking branch 'origin/master'

Conflicts:
	web/js/application.js