Merge pull request #54 from vhalbwachs/sprint3

Fix data generator that was causing server to crash on startup
Redesigned dashboard layout.
Redesigned dashboard layout - more.
Merge pull request #55 from marcoau/development

Resigned dashboard layout, work in progress.
clear branch for master