Close #242
Close #243 Merge remote-tracking branch 'origin/feature/242-getview-from-object' into development

Conflicts:
	fof/model/model.php