this is my first branch commit
Merge branch 'master' of https://github.com/curediary/curediary
Merge branch 'pavel'
Merge branch 'pavel'
Merge branch 'pavel'
Calendar
Merge branch 'master' of https://github.com/curediary/curediary

Conflicts:
	res/layout/pill_info_activity.xml
	src/com/cure/diary/AboutPillActivity.java
no tracking out