dashboard working
fixes merge conflict
Merge branch 'master' of github.com:ambertunnell/worldview into ben_2
Updates Amber's footer info, still need Edward's