minor fixes and deletion of useless logging
Merge branch 'master' into calendar
preventing appcache from bein merged with origin/master
Merge pull request #94 from se1-1314/calendar

Calendar