Fixing data attributes on create object buttons
Merge branch 'master' into develop