Navigation target hotfix
Merge branch 'hotfix/navigation_target_hotfix' into develop

Conflicts:
	core/structure.class.php
forms and api hotfix
Merge branch 'develop'