Better support for methods and imports.
Merge remote-tracking branch 'origin/master'

Conflicts:
	DomsGui/src/main/webapp/editRecord.xhtml