Energy Bug Fix

energy would charge while paused
changed effect on pickup
Merge branch 'master' of https://github.com/LuckyMarq/collide
Merge branch 'master' into Leif

Conflicts:
	entities/enemies.js
Removed Clutter
Merge branch 'Leif'
Fixed player explosion bug, Moved All explosions to miscEntities
fixed input in chrome
added rocket keyframe and other minor changes
added level ender and config for maps
Merge branch 'Leif' into 'master'
improved wave visual
lots of changes

improved appearance of explosions and particles
moved weapon pickups to pickups.js and deleted its file
removed old code building and rebuilding the map
added tinting to the basic shader
cleaned up some old code
bug fixes
more bug fixes
Merge branch 'Leif' into master
Merge remote-tracking branch 'origin/master' into Aaron