Switched to online compression for development
Merged a bunch of stuff
Revert "Merged openstack/horizon/master"

This reverts commit 6bf6287ccaaf3b1771beecf4066d57a278217f33, reversing
changes made to b6e4b6b6c5dcfbf8e223a660bcf7c33583674d23.

Conflicts:
	openstack_dashboard/settings.py