Increased compile speed in ResourceManager
Merge branch 'dev' into dev_NL
Fixed errors
Merge branch 'dev' into dev_AO