debug...
Merge branch 'master' of https://github.com/stevwayne/ISST-Android

Conflicts:
	src/cn/edu/zju/isst/CommentListContainer.java
	src/cn/edu/zju/isst/CommentListFragment.java
	src/cn/edu/zju/isst/MainActivity.java
	src/cn/edu/zju/isst/MenuFragment.java