Merge branch 'dev' of github.com:switchonproject/cids-custom-switchon into dev
completed the Meta-Data Editor Mockup