populating add form drop downs
Merge branch 'master' of https://bitbucket.org/cog1/data
Fixed scroll, AGAIN
Merge branch 'master' of https://bitbucket.org/cog1/data

* 'master' of https://bitbucket.org/cog1/data:
  populating add form drop downs
  adsjfhbasbdhf
add views