Modell.js edited
Merge branch 'master' of github.com:Xenoage/OpenTune

Conflicts:
	doc/Andie/Modell.js
gui.js edited
Merge branch 'master' of github.com:Xenoage/OpenTune

Conflicts:
	src/js/gui.js
	src/js/modell.js
Merge branch 'master' of github.com:Xenoage/OpenTune

Conflicts:
	src/js/gui.js