moritz
Merge remote-tracking branch 'origin/test1' into test1

Conflicts:
	script.js
Merge remote-tracking branch 'origin/test1' into test1
moritz
Merge remote-tracking branch 'origin/test1' into test1

Conflicts:
	objects.js
moritz