Made elements primary data for categories
categories
Moved defs
Merge remote-tracking branch 'origin/master' into staging
history
auto-merge staging into master