Changes from server
Merge branch 'master' of github.com:drew1080/houston-architectural-survey