added form
added fields to user model
merged remote
re-added fields to users
Merge branch 'admin_screens' of github.com:joshblour/quito-backend into admin_screens
merged remote
added simpleform with bootstrap
Merge branch 'admin_screens' of github.com:joshblour/quito-backend into admin_screens
merge remote branch