Renamed variables that would conflict with a rename of iMap to map

Note to plugin developers: if you were importing the "map", you'll need
to change it to "maplist"

Signed-off-by: Haru <haru@dotalux.com>
Merge branch 'master' of https://github.com/HerculesWS/Hercules into ghbb

Conflicts:
	src/map/battle.c
	src/map/clif.c
	src/map/guild.c
	src/map/map.c
	src/map/map.h
	src/map/npc.c
	src/map/script.c