学习园地模块基本功能
Merge branch 'master' of https://github.com/ZJU-ISST/ISST-Android

Conflicts:
	src/cn/edu/zju/isst/db/DataManager.java
	src/cn/edu/zju/isst/ui/main/MainActivity.java