Merging
Merge branch 'persistance'

Conflicts:
	lavamusix/.classpath
	lavamusix/src/main/java/is/lavamusix/lavamusix/controller/HomeController.java