Checking in straight to develop
I'm a bad, bad boy
Merge remote-tracking branch 'origin/develop' into feature/coredata

Conflicts:
	coredata.txt