made java and snapshot version changes
Switched to jettey for local server
Merge branch 'master' into java1.7-snapshot0.3

Conflicts:
	build.gradle
Merge pull request #33 from spidasoftware/java1.7-snapshot0.3

Java1.7 snapshot0.3