Bug fixes
Merge branch 'active' of https://github.com/nightfall983/Jukebox into active

Conflicts:
	Jukebox/app/src/main/java/com/ketonax/Constants/Networking.java