merge
Merge branch 'master' of https://github.com/Cyberlightning/Cyber-WeX
working on json coding and database