10.06pm SYNC NIGEL

STUPID EXTENT
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/res/layout/extent.xml