Abstracts classes. Admin templates edited.
Merge branch 'feature' into dev