Merge branch 'develop' of github.com:SHSTuring/norewar into develop
modify the structure of views
Merge branch 'develop' of github.com:SHSTuring/norewar into UI
modify the structure & improve again