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.
Merge branch 'master' of https://github.com/HerculesWS/Hercules into ghbb