stuff
Merge remote-tracking branch 'origin/master' into temp-branch
Updated to use new map system :D
fixed map.php
Merged the notify master changes into tempbranch
Notice testers instead of messaging exc. new maps
added a ton of much-needed .slap features
some other changes
Merge remote-tracking branch 'origin/master' into temp-branch
stuff
PANIC
Merge remote-tracking branch 'origin/master'

Conflicts:
	Web/mapsubmit.php