Merge branch 'master' of /Users/jvs/Enonic/wem-ce/wem-ce with conflicts.
CMS-3606 LiveEdit - Let ItemView's managing data hold direct reference to data object
Now updating each PageComponentView with data after parsing