Merge branch 'master' of https://github.com/braveliao/GeepiStudio

Conflicts:

qixingapp/src/android/qixing/bin/classes/com/geepi/network/adapter/AuthA
dapter$1.class

qixingapp/src/android/qixing/bin/classes/com/geepi/network/adapter/AuthA
dapter.class
test