add CircleView
# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch fuckSina
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
#	new file:   lib/gson-2.2.4.jar
#	modified:   src/main/java/com/ifancc/campus/config/URL.java
#	new file:   src/main/java/com/ifancc/campus/dao/OAuthDao.java
#	new file:   src/main/java/com/ifancc/campus/exceptions/CampusException.java
#	new file:   src/main/java/com/ifancc/campus/exceptions/WeiboException.java
#
Merge remote-tracking branch 'github/master' into github_master

Conflicts:
	Campus/src/main/java/com/ifancc/campus/ui/OAuth2Activity.java
add generateProto.bat.rtf