Master changes
STUFF
Merge branch 'master' into develop

Conflicts:
	Sample_code.py