Rendertags
Merge https://github.com/xBeam/kalendarWithMarks into Nik

Conflicts:
	kalendar with marks/Start.cs