Creating template
Commit from JBoss Tools
Creating template
Merge branch 'master' of ssh://52f895d74382ec7ccb000020@test-clxy.rhcloud.com/~/git/test.git/
Commit from JBoss Tools
test
test
enable debug local
Merge branch 'master' of https://github.com/clxy/OpenShiftTest.git

Conflicts:
	.gitignore
	README.md