fix control js
resolve conflict
Merge branch 'dev' of https://github.com/yiouli/Project_Stellar into dev
fix undefined error
resolved conflicts