Include iconfont in common.css
Replace the following sprite images with icon font
- Restart
- Search
Create DNS plugin using Amazon Web Services Route 53
adding mocks for AWS::Route53::Client
starting to stub AWS methods
added test for modify
Bug 913217
Bug 916026 - Removing hardcoded library version references from jenkins password encoder classpath

Conflicts:

	cartridges/openshift-origin-cartridge-jenkins-1.4/info/hooks/configure
Bug 913217
Merge branch 'master' of github.com:openshift/origin-server into iconfont
remove margin because it needs to only be for icons set using their class name
Move fonts from li to openshift-server
apply margin to class that controls :before positioned fonts for offset
Fix for bug 916268 - adding properties for embedded carts in application rest response
Note: this was opened as a regression for bug 812046
Use update rather than find_and_modify
Bug 916311 - Expired tokens should be hidden
Added opts to pricing for anchors
Merge pull request #1471 from brenton/BZ916026

Merged by openshift-bot
Merge pull request #1478 from abhgupta/abhgupta-dev

Fix for bug 916268 - re-adding properties for embedded carts
Merge pull request #1473 from danmcp/master

Switching some find and modify calls to updates
Merge pull request #1474 from bdecoste/master

Bug 913217 895507 [merge]