Merge remote-tracking branch 'origin/master'

Conflicts:
	Delivery/src/main/res/layout/fragment_main.xml