mixins moved to their own files
minor changes
Merge branch 'dataelement'