Merge branch 'upstream/master'
appinfo xschema element visualization
refactoring
Merge remote-tracking branch 'refs/remotes/ilshat/master'
extended schema