Fixed splashscreen colors
Merge branch 'master' into alex
Working on the dashboard
Merge pull request #69 from blind-squirrel/alex

Alex