Merge branch 'master' into John
layout changes

layout changes
new title
style changes

style changes
style and layout changes

style and layout changes
dashboard looking a bit sexier...

more style and layout changes!
Merge branch 'John'