test
new uploader added + spring DI fix
new upload + spring-kram
Merge branch 'jerseySpringTest' of https://github.com/flyingSkull/monkeyBook

Conflicts:
	WebContent/WEB-INF/web.xml