Data input function
Merge remote-tracking branch 'origin/master'

Conflicts:
	testresources/dynamicform.xml