Sync local_settings.py with Grizzly
Merge pull request #87 from vuntz/grizzly-conf

Sync local_settings.py with Grizzly
Make it possible to change SITE_BRANDING in local_settings.py

This is not visible in the UI as this might not be of interest to most
people.
Remove unneeded override attribute
Merge pull request #90 from vuntz/site_branding

https://github.com/crowbar/barclamp-nova_dashboard/pull/90

Merged by devtool for cloudsleuth