同步
Merge branch 'master' of https://github.com/luohong/tdaoj.git

Conflicts:
	gen/com/alexbbb/uploadservice/R.java
	gen/com/handmark/pulltorefresh/library/R.java
	gen/com/tdaoj/R.java