Adding validation to the models
Adding more descriptive text to the demo views
Fixing merge conflicts
Fixing merge conflicts in AdminUser model