Resourcemanager.hpp

Made functions public
Merge remote-tracking branch 'origin/master'

Conflicts:
	include/ResourceFactory.hpp