Separation of editfield part 2
Merge branch 'separate-editfields-2' of github.com:rarila/bolt into rarila-separate-editfields-2

Conflicts:
	app/view/_sub_editfields.twig
Merge branch 'rarila-separate-editfields-2' into feature/bolt2