Update README.md
Updated for Liferay 6.2-CE-GA2
Updated for Liferay 6.2-CE-GA2
Fixed the maven build faiure for missing web.xml
commented the code for reinitializing the openshift_env_vars.
License updated
Liferay portal mysql and postgresql paths updated
Updated the standalone.xml inline with updates to jbossas-7 cartridge
Fix for jboss-deployment structure error, and liferay.home change
Updated the liferay.home to new $OPENSHIFT_DATA_DIR
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.openshift/action_hooks/build
	.openshift/action_hooks/deploy
	.openshift/action_hooks/deploying-war-info
	.openshift/action_hooks/pre_start_jbossas-7
	.openshift/config/modules/com/liferay/portal/main/portal-service.jar
	README.md
	customization/ROOT.war/WEB-INF/classes/portal-ext.properties
	pom.xml