test
Merge branch 'master' of https://github.com/mrrej89/UICon.git

Conflicts:
	Desktop/desktop.html
Almost working drag and drop customers to calendar (worked once..)