fix the navbar css to work with templates that don't use twitter bootstrap
Merge branch 'fix-admin-navbar' into 2.1