Commit: Calendar Button
Merge remote-tracking branch 'origin/master' into master-kevin

Conflicts:
	src/co/nextix/jardine/activities/add/fragments/AddActivityDetailsAndNotesFragment.java