Develop to master

With new aircraft ident hotfix + proximity fixes