fixed map
fixed map
Various changes

added map view and timers as well adding a time period to radial forcex
Merge branch 'master' into weaponsbranch

Conflicts:
	entities/miscEntities.js