dependency cleanup
dependency cleanup
Merge branch 'master' of https://github.com/alex0x08/paster

Conflicts:
	uberPaste/src/main/webapp/WEB-INF/web.xml