Use html5 data attributes for showing/hiding components
Merge remote-tracking branch 'origin/development' into development