Made the resource loading configurable to the end user
Fixed broken tests
Merge pull request #217 from lyncodev/adding-loader

Made the resource loader configurable to the end user
Merge branch 'master' into feature/220