[zeropol2]
커밋 누락부분 반영
Merge branch 'master' of https://github.com/HubHaru/haru_android.git

Conflicts:
	haru/src/com/projects/haru/datamanager/TaskDataManager.java