calendar and layout tweaks
Merge branch 'master' of https://github.com/mrrej89/UICon

Conflicts:
	Desktop/desktop.html