Merge branch 'hotfix/view'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Removed sync as this is obsolete at the moment
Removed comma
Added root property
Updated .gitignore
updated cuid and uid functionality. Change events to be triggered by name, cuid and uid