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

Conflicts:
	AndroidManifest.xml
	src/cn/edu/zju/isst/CommentFragment.java
	src/cn/edu/zju/isst/CommentListFragment.java