Initial 2.0 copy from Apollo stuff
asdf
Fixed password
Took out doorman specific fields. Combined with ORM stuff from apollo development.
Merge branch '2.0'