Merge pull request #6 from roselone/master

wjy sync
Merge pull request #29 from bxl1989/master

pull add something about location
Merge pull request #7 from bxl1989/master

update
update wjy
create project
Merge pull request #31 from purejade/master

update GUI
fuck blackspace
Merge pull request #18 from roselone/master

update 3-22