Merge remote-tracking branch 'origin/master'

Conflicts:
	Greenfooter/Accounts.csv
	Greenfooter/build/classes/Character.class
	Greenfooter/build/classes/Collectables.class
	Greenfooter/build/classes/ScrollWorld.class
	Greenfooter/build/classes/Svar1.class
	Greenfooter/nbproject/private/private.xml
	Greenfooter/src/ScrollWorld.java