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 #1865 from sg00dwin/401dev

Merged by openshift-bot
corrected broker extended test
Randomizing UIDs in available_uids list for district
Merge pull request #1868 from lnader/master

Merged by openshift-bot
default read should be from primary
Merge pull request #1870 from rajatchopra/master

Merged by openshift-bot
Fix v2 ERB processing

Fix ERB processing by reverting a portion of this commit:

https://github.com/openshift/origin-server/pull/1837/files#diff-13
Merge pull request #1871 from ironcladlou/dev/v2carts/bugs

Fix v2 ERB processing
Suppress NodeLogger calls in the context of gear script
Merge pull request #1872 from pmorie/dev/gear

Merged by openshift-bot
WIP: v2 snapshot/restore
Merge pull request #1867 from abhgupta/abhgupta-dev

Randomizing UIDs in available_uids list for district
Merge pull request #1874 from pmorie/dev/oo-snapshot

Merged by openshift-bot
Merge remote-tracking branch 'upstream/master'