Merge remote-tracking branch 'origin/master'

Conflicts:

	SDS.Mobile/app/src/main/java/com/example/spawneddeliveryservice/MainActivity.java