Login Screen
login
Merge branch 'master' of https://github.com/kthuang90/pocketplayer.git

Conflicts:
	PocketPlayer/res/values/strings.xml
strings
Merge branch 'master' of https://github.com/kthuang90/pocketplayer.git

Conflicts:
	PocketPlayer/res/values/strings.xml