Origin files from server
Merge branch 'master' of github.com:XiaoHuang/ShastaTest