implemented 3
Merge remote-tracking branch 'remotes/origin/master'

Conflicts:
	lab2/at.ac.tuwien.big.forms.form/src/at/ac/tuwien/big/forms/form/scoping/FormScopeProvider.java
fixes
Merge remote-tracking branch 'remotes/origin/master'

Conflicts:
	lab2/at.ac.tuwien.big.forms.form/src/at/ac/tuwien/big/forms/form/scoping/FormScopeProvider.java