Merge branch 'feature/push' into dev

Conflicts:
AndroidManifest.xml
src/cn/edu/zju/isst1/v2/net/CSTJsonRequest.java