Second Commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	res/layout/pill_info_activity.xml
	res/values/strings.xml
	src/com/cure/diary/MainActivity.java