pom
pom javax.servlet
removing hot_deploy
Commit from JBoss Tools
Creating template
Merge ssh://movies-mwojcik.rhcloud.com/~/git/movies

Conflicts:
	.openshift/config/standalone.xml
	README.md
	pom.xml
	src/main/webapp/WEB-INF/web.xml
pom
openshift pom change reverted - openshift doesn't find javax.servlet