fix transclude in screen and navigator
navigator: fix navigator-toolbar not seen inside page
yupdage project template
merge from origin