Merge pull request #3 from j0x7c4/wengbin

update current marker
Merge branch 'wengbin' of github.com:j0x7c4/hackstreet
milestone4
update
Merge branch 'master' of https://github.com/j0x7c4/hackstreet into wengbin
milestone5
Merge branch 'master' of https://github.com/j0x7c4/hackstreet into wengbin
ui
Merge branch 'master' of https://github.com/j0x7c4/hackstreet into wengbin
fixed current shop showed bug