Creating template
Merge commit '468f31bc12aacc883d69fd5b756ea606d8d0766f' into openshift

* commit '468f31bc12aacc883d69fd5b756ea606d8d0766f':
  Creating template

Conflicts:
	.openshift/config/standalone.xml
	README.md
	pom.xml
Change to wildfly 8 standard configuration
Creating template
Merge commit '99f0cf51833ae8db1d903c2a151e27d0f4b7edfb' into openshift

* commit '99f0cf51833ae8db1d903c2a151e27d0f4b7edfb':
  Creating template

Conflicts:
	README.md
	pom.xml