test

test Gui
Merge remote-tracking branch 'origin/master'

Conflicts:
	js/main.js
	js/module.js
	js/view.js