added component loader
added instance to ComponentLoader
Merge remote-tracking branch 'origin/dev' into dev