Renamed iTimer interface to timer.
Also removed duplicate mentions of timer within calls to shorten.
Merge branch 'master' of https://github.com/HerculesWS/Hercules

Conflicts:
	src/map/chrif.c
	src/map/clif.c
	src/map/homunculus.c
	src/map/pet.c
	src/map/script.c
	src/map/skill.c
	src/map/status.c
All clear.
Renamed local variables that would conflict with a rename of iStatus to status

Signed-off-by: Haru <haru@dotalux.com>
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
Fixed Death count anywhere
Added script for Hat of Girl