Resource Manager added
Merge branch 'master' of github.com:th0rnout/NuclearRush

Conflicts:
	entities/Entity.h
	world/World.h