removed Render()

yolo
Merge remote-tracking branch 'origin/master' into Bas
EnemyMoveComponent
Merge remote-tracking branch 'origin/master' into Bas

Conflicts:
	Overdose/Overdose/Factory.cpp
	Overdose/Overdose/ILevel.h
	Overdose/Overdose/Level1.cpp
	Overdose/Overdose/Level1.h
	Overdose/Overdose/Overdose.vcxproj
	Overdose/Overdose/Overdose.vcxproj.filters
update

bug fixes, not done yet
Merge remote-tracking branch 'origin/master'