Merge branch 'master' of https://github.com/HubHaru/haru_android

Conflicts:
	haru/src/com/projects/haru/ui/DayViewListView.java