Committing and merging

Committing changes so I can merge into Dashboard to more easily work
with Cam.
Fixing a merge bug.
Merge branch 'Dashboard' of https://github.com/GUI2BCD/Frontend into Dashboard