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
<docs> Adding initial contributor guidelines document
Bug 913217
Adding pages which are used during doc generation.
Merge pull request #1476 from kraman/master

Adding pages which are used during doc generation
Fix for bug 916268 - adding properties for embedded carts in application rest response
Note: this was opened as a regression for bug 812046
Merge pull request #1472 from sosiouxme/contributorguide

Merged by openshift-bot
Use update rather than find_and_modify
Automatic commit of package [openshift-origin-broker-util] release [1.5.6-1].
Automatic commit of package [rubygem-openshift-origin-msg-broker-mcollective] release [1.5.6-1].
Automatic commit of package [rubygem-openshift-origin-node] release [1.5.7-1].
Automatic commit of package [openshift-origin-cartridge-jbosseap-6.0] release [1.5.5-1].
Automatic commit of package [openshift-origin-msg-node-mcollective] release [1.5.6-1].
Automatic commit of package [openshift-origin-cartridge-jbossas-7] release [1.5.5-1].
Automatic commit of package [openshift-origin-cartridge-abstract] release [1.5.5-1].
Automatic commit of package [rubygem-openshift-origin-controller] release [1.5.8-1].
Automatic commit of package [openshift-origin-cartridge-jbossews-2.0] release [1.2.4-1].
Automatic commit of package [openshift-origin-node-util] release [1.5.4-1].
Automatic commit of package [rubygem-openshift-origin-common] release [1.4.5-1].