Renaming all Components, Zindex merged into drawable, particleTimerComponent merged into particle
Merge branch 'master' of github.com:Gamemaker-Ag/secret-octo-dangerzone

Conflicts:
	src/models/playerModel.lua