change caledar
Merge branch 'master' of http://github.com/Mattze96/miniblog

Conflicts:
	sites/home.tpl