Merge branch 'dev' of github.com:switchonproject/cids-custom-switchon into dev
completed Basic-Resource-Renderer
#10 added the Advanced Resource Renderer