Fixed execution ids
use npm-proxy for Openshift profile
Is this how you do env variables in Maven
Extra slash
Working on OpenShift build
Working on OpenShift build
Merge branch 'master' of ssh://pdfeditor-spacetrader.rhcloud.com/~/git/pdfeditor

Conflicts:
	pom.xml
Added package.json for bower dependency