calendar works on its own, needs to be integrated
Merge branch 'master' of github.com:lorkor/Loo

Conflicts:
	Loop.xcodeproj/project.pbxproj
	Loop.xcodeproj/project.xcworkspace/xcshareddata/Loop.xccheckout