migrate to tomcat
Merge branch 'master' of https://github.com/Adi3000/subsonic-main.git
Merge branch 'master' of https://github.com/Adi3000/subsonic-main.git

Conflicts:
	pom.xml