Merge branch 'master' into develop

Conflicts:
	Project8.rb