test
Merge branch 'master' of https://github.com/drubas/model_engineering_lab4

Conflicts:
	xtend-gen/at/ac/tuwien/big/form/htmlgen/.Form2HTMLGenerator.java._trace
Merge branch 'master' of https://github.com/drubas/model_engineering_lab4

Conflicts:
	xtend-gen/at/ac/tuwien/big/form/htmlgen/.Form2HTMLGenerator.java._trace
1. javascript teil funkt, visibility fehlt noch