Merge branch 'work' into develop

Conflicts:
	DTFoundation-Goonbee.podspec