修改api
Merge branch 'master' of
https://github.com/chenjia94/designer-android.git

Conflicts:
	src/com/bruce/designer/activity/Activity_Login.java
	src/com/bruce/designer/activity/Activity_Main.java
	src/com/bruce/designer/activity/Activity_UserInfo.java
	src/com/bruce/designer/api/ApiWrapper.java
	src/com/bruce/designer/api/account/RegisterLoginApi.java
	src/com/bruce/designer/api/account/WeiboLoginApi.java
	src/com/bruce/designer/api/album/AlbumCommentApi.java
	src/com/bruce/designer/api/album/AlbumInfoApi.java
	src/com/bruce/designer/api/album/AlbumListApi.java
	src/com/bruce/designer/api/user/UserFansApi.java
	src/com/bruce/designer/api/user/UserFollowsApi.java
	src/com/bruce/designer/api/user/UserInfoApi.java