Content from API
Merge remote-tracking branch 'origin/master'

Conflicts:
	DeltionRooster/src/main/AndroidManifest.xml
	DeltionRooster/src/main/res/values/strings.xml