Updated libraries and fixed web.xml merge
Updated persistance and added annotation driven transations.
Merge branch 'master' of https://github.com/leinb1dr/javatunes-webservice-spring

Conflicts:
	WebContent/WEB-INF/web.xml
	build/classes/META-INF/persistence.xml