new UI framework
Merge branch 'ZhangQi' of https://github.com/bg95/WhitePigeon into ZhangQi