Added more models for admin interface.
Merge remote-tracking branch 'origin/master'