Connected to DB
Merge branch 'master' into persistance

Conflicts:
	lavamusix/src/main/resources/lavamusic.db
db moved to src