working on UI
commit merge
some more ui stuff
-dropdowns to map and report panels
Merge pull request #45 from marsmith/master

some changes
resolved merge conflicts