FPS update

Not working properly yet.. but gotta check differences with the master
without losing progression!
FPS updates
Bearman Update

yeah... should have wasted my time on something else
Fixed Memory Leak in GameEntityFactory
Merge remote-tracking branch 'origin/master' into Bas

Conflicts:
	Overdose/Overdose/FPSDrawComponent.cpp
	Overdose/Overdose/GameEntity.h
Small Merge Fix
Respawn
Fixed Memory Leak in GameEntity Factory
Updated player input movement

Removed the bug where you could run left while holding right button.
Changed drugcomponent so that the xSpeed would be set, and not the
default movementspeed would get overwritten.
FPSdrawComponent Update

Put back the timer that i removed earlier, since i couln't get
'KeyRelease' or something like that to work...
Changed the timer slightly and combined it with the boolean, so you can
enable/disable it by clicking, but the timer will make sure there is a
small window so the boolean wont get switched 60 times per second. (max
1 time each 0.5 seconds)
NegativeMarijuanaComponent created
Merge branch 'master'
Fixed memleak in CollissionComponent
Resolved Merge Conflict
Improved timings for healthComponent
Slightly improved KnockBackComponent
More Levels!

Also: ReloadLevel method in LevelManager (in case of death, or w/e)
mem leak drug
Merge branch 'master' of https://github.com/Trevorr1/Minor_Game.git
Fixed major memory leak in surface