add some UI
fix the conflict
don't know
Merge branch 'master' of https://github.com/HellMagic/x-mothership