long untouched stuff pushing in
Merge branch 'two-dot-o' of ssh://stash.safehaus.org:7999/chop/main into two-dot-o

Conflicts:
	webapp/pom.xml
	webapp/src/main/java/org/safehaus/chop/webapp/Module.java
	webapp/src/main/java/org/safehaus/chop/webapp/rest/UploadResource.java
	webapp/src/test/java/org/safehaus/chop/webapp/JettyResource.java
copied new webapp and runner modules to add new embedded jettyjam stuff