Merge from master
Merge remote-tracking branch 'repo/master'

Conflicts:
	app/src/main/res/values/strings.xml
Removed unnecessary undefined IDs
Merge remote-tracking branch 'repo/master'
Updated party play
Merge remote-tracking branch 'repo/master'