Merge remote-tracking branch 'max/master'
small fixes
improve go to object
merge
Merge remote-tracking branch 'max/master'
improve go to object
going back if to close to object
add launch files
Merge remote-tracking branch 'upstream/master'