fixing rebase

fix rebasing conflicts

change server to broker

change server to broker
Adding jenkins templates to carts
Card 515 - Improve test coverage
Corrected test to reflect changes in API
adding jenkins artifacts glob
V2 cart state management implementation
Typo fixes
Merge pull request #1856 from danmcp/master

Adding jenkins jobs to v2 carts
Merge pull request #1859 from ironcladlou/dev/v2carts/state-management

Merged by openshift-bot
Bug 928752: Run threaddump/system-messages only on primary cart

Fix a regression whereby threaddump and system-messages actions were being
sent to non-primary cartridges.

Resolve https://bugzilla.redhat.com/show_bug.cgi?id=928752.
Moving openshift-icon to a partial and including in common so that mixin can be applied
Created a mixin for text-overflow .truncate and used with aliases list
Created markup for header button usage of add/create function
Switched individual application page from using sprite images to icon font
Swiched application list to use right arrow icon instead of sprite
Removed bottom positioning of icons with h1,h2 b/c when used with truncate the overflow:hidden cut the tops off.
A couple of variables added for colors
Merge pull request #1861 from brenton/typo1

Typo fixes
Merge pull request #1669 from tdawson/tdawson/minor-spec-cleanup/2013-03-15

Merged by openshift-bot
adding all the jenkins jobs
Merge pull request #1862 from ironcladlou/bz/928752

Merged by openshift-bot
Merge pull request #1864 from danmcp/master

Updating jenkins templates
Revert "Update code for default server.js so no warning are displayed"

This reverts commit d6763549b49a11937f7b6bbff84f1583fa786414.
Merge pull request #1865 from sg00dwin/401dev

Merged by openshift-bot
corrected broker extended test
Merge pull request #1868 from lnader/master

Merged by openshift-bot