blog changes
Merge branch 'staging'

changes for 4.1: email, json, templates
dataval ordering on structure page
fieldtype drop-box added