check in changes for grizzly server
Merge branch 'master' of
https://github.com/League-of-Noobs/app-server.git

Conflicts:
	jersey1-grizzly2-spring/pom.xml
	jersey1-grizzly2-spring/target/classes/META-INF/MANIFEST.MF
	jersey1-grizzly2-spring/target/classes/db.properties