overwrite mixin and adjustoffset for primary nav
Merge pull request #1204 from danmcp/master

Merged by openshift-bot
In production, don't attempt to connect to the REST API on startup

Passenger can only boot one rack app at a time, and attempting to contact the broker during startup causes a timeout and then wait (broker can't be started until site completes, and we can't change the order).
use clearfix instead of overflow:hidden allows tb focus to be seen
Merge pull request #1207 from smarterclayton/only_boot_rest_api_in_development

Merged by openshift-bot
Moving model refactor work
- Updated cartridge manifest files
- Simplified descriptor
- Switched from mongo gem to use mongoid
fixed error on creating app by adding the user lock on user create
Various bugfixes
Added support for thread dump.
Fixed default username in mongoid.yml file
Fixing php manifest
Adding logging statements for debugging scaled apps
deregister dns
Fixed scaled app creation
Fixed scaled app cartridge addition
Updated descriptors to set correct group overrides for web_cartridges
add bson_ext
Merged Ravi's changes for usage records
fix db for test
fix ss refs
fixup cloud user usages
bug fixes in app and descriptor controller
test case fixes + typo fixes
config is msg_broker and not gearchanger