removed name from the currentMap structure
Merge branch 'master' of https://github.com/jensenr30/De_Flux

Conflicts:
	map_functions.h

merged changes