calendar, pillinfo
Merge branch 'master' of https://github.com/curediary/curediary

Conflicts:
	src/com/cure/diary/AboutPillActivity.java
	src/com/cure/diary/AddPill/Fragments/DateFragment.java
	src/com/cure/diary/CalendarFragment.java