Styles changes and settings view updates.
Merge remote-tracking branch 'upstream/master' into Metering
Merge branch 'Metering' of https://github.com/shane-beliveau/cdbapp
New splash logo
Merge remote-tracking branch 'upstream/master' into Metering