Fixat massa problem
Merge branch 'master' of https://github.com/P1-Sputify/SputifyGUI

Conflicts:
	SputifyGUI/src/se/mah/patmic/sputifygui/PlayActivity.java