add EnemyFactory(STageFactory)
Merge remote-tracking branch 'origin/master'

Conflicts:
	Classes/CollisionListener.cpp