updated cross origin
Merge branch 'master' of github.com:tut3c/jaxrsrestapi

Conflicts:
	src/main/java/com/tut3c/resources/GameResource.java