All the stuff for 2nite
Merge remote-tracking branch 'upstream/master' into buttontts

Conflicts:
	includes/crazyCarl.as