Merge pull request #1 from pbielicki/tomcat_7.x

Tomcat 7.x
Merge branch 'master' of https://github.com/pbielicki/openshift-playground

Conflicts:
	src/main/java/com/bielu/oshift/service/rest/crime/CrimeService.java