moved playlistplayeractivity into mainactivity and spotifyapisingleton
Merge branch 'master' of github.com:MortenBirk/camp

Conflicts:
	app/src/main/java/com/cac/camp/camp/PlaylistPlayerActivity.java
	app/src/main/java/com/cac/camp/camp/StartScreenActivity.java