Style calendar
Merge branch 'master' into style-layout-dark

Conflicts:
	public/css/styles.css
Merge pull request #1 from epilande/master

Style calendar