Reordering of dashboard
Merge branch 'master' into website/dashboard-mock
Merge branch 'master' of https://github.com/just-kile/Zapfmaster2000 into website/dashboard-mock
#124 Added newsfeed overview page at dashboard
#124 Added boxName to drawfeed
#124 Switched to future live urls
#124 Added users overview page
Merge pull request #125 from just-kile/website/dashboard-mock

Website/dashboard mock