Calendar, views.
Merge branch 'ALEWKA228'
Merge branch 'master' of https://github.com/curediary/curediary

Conflicts:
	res/drawable/d_calendar_cell_default.xml
	res/layout/calendar_single.xml