init
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/modeling/app/validation/FieldValidator.java