Merge origin/master

Conflicts:
	src/main/java/groovesquid/model/Song.java