small calendar
Merge branch 'trunk' of https://github.com/SergeySukhanov/zeroProject into trunk

Conflicts:
	resources/css/zero.css