Added Database Views and such.
Merge remote-tracking branch 'Origin/master'