Fixed issue with resolveFile not handling cache protocols properly
Added default resolver into content settings singleton
Merge branch 'feature/resolver-settings' into develop

* feature/resolver-settings:
  Added default resolver into content settings singleton
  Fixed issue with resolveFile not handling cache protocols properly

Conflicts:
	src/main/java/com/cube/storm/ContentSettings.java