Merge branch 'dev'
Merge branch 'master' of github.com:openshift/origin-server
Merge branch 'master' of github.com:openshift/origin-server
Merge branch 'master' of github.com:openshift/origin-server
Merge branch 'master' of github.com:openshift/origin-server into misc-dev
Quickstart scalability now determined in summary field
Added unit tests for quickstart scalability parsing
Faster regex + DRYer mocking for unit tests
BZ888671 -  oo-accept-broker or oo-accept-systems will create production.log, the file's permission is wrong.

In doing this I also switched all the logs to have a mode of 640.  This also
resolves the user_action.log issue:
https://github.com/openshift/origin-server/issues/977
Revised quickstart scalability check to handle nil summary
Merge branch 'master' of github.com:openshift/origin-server into misc-dev
Minor tweak to the broker log owner/mode issue

I'm not comfortable relying on attr and ghost to work as I would expect it.
This makes the intention a little more clear: "No matter what happens, make
sure the files are owned by apache and have a mode of 640"
Merge branch 'master' of github.com:openshift/origin-server into misc-dev
switch to <p> for spacing
Switch app url form to use lates twitter prepend.append and block them >480; plus multiple cleanup changes

app/assets/stylesheets/_forms.scss
 - several adjustments to tightin up form elements overall
	label
	control-group
	form-actions
	add-on vertical-align: bottom makes height equal to inputs
	control-group-important label size

app/assets/stylesheets/_variables.scss
 - create console bg color variable

app/assets/stylesheets/console/_application.scss
 - box-shadow not box_shadow
 - block input and add-on at mobile res

app/assets/stylesheets/console/_core.scss
 - yank html bg color, set in _base
 - move modifiers for form, selection, code, pre, table to _base

/app/views/application_types/show.html.haml
 - remove page level rule so block setting can happen

/app/views/applications/_name.html.haml
 - change markup to use latest prepend.append add-on rules
Merge pull request #1096 from brenton/BZ888671

Merged by openshift-bot
Merge pull request #1090 from nhr/quickstart_scalability_logic

Merged by openshift-bot
Merge pull request #1100 from sg00dwin/misc-dev

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