Fixed bug #26 and moved field- and instance-definition in separate include files.
Merge branch 'master' into 16-prefill-forms

Conflicts:
	fse.install
Made some clean ups in prepopulation function.