bot
refactor PlaneType
fix main method in html and ios part
Merge branch 'master' into dev