Bug 917713
Bug 912010 - Make the 'cartridge' tag match all cartridges
BZ 905647: Push down cookies to ws lib.
Gemfile.lock ownership fixes

A user on #openshift-dev somehow got into a state where Gemfile.lock had a mode
of 640.  Previously it was owned by root.  It's probably more correct to change
the ownership since the intent is that Apache should _always_ be able to read
that file.
Move test case into rest_api_test.rb
force stop - fix bug#915587
- first glyph gets position: relative
- other glyph(s) get position: absolute and left:0

- more margin-left
- Add h1,h2,h3,h4,h5 rules
Bug 917713
Merge branch 'master' of github.com:openshift/origin-server into icon-changes
Bug 902118 - Removing generated hidden form fields

When changing application type modes, the rails generated hidden
fields are stripped out.
Make v2 get_cartridge use instance dir instead of system path
Merge pull request #1512 from rajatchopra/master

force stop - fix bug#915587
Merge pull request #1540 from mrunalp/bugs/905647

BZ 905647: Push down cookies to ws lib.
Bug 917163
Merge pull request #1534 from liggitt/bug_912010_cartridge_filter_empty_results

Bug 912010 - Make the 'cartridge' tag match all cartridges
Merge pull request #1543 from danmcp/master

Bug 917163
Merge pull request #1539 from jtharris/bugs/BZ902118

Bug 902118 - Removing generated hidden form fields
Merge pull request #1545 from pmorie/dev/v2_get_cart

Make v2 get_cartridge use instance dir instead of system path
Merge pull request #1541 from bdecoste/master

Merged by openshift-bot
Merge pull request #1546 from rmillner/US3143

Merged by openshift-bot