Fixes #87
keeping appcache out of every branch but the appcache branch
prevent it from being merged with the master
Merge pull request #93 from se1-1314/navbar

Navbar
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
Merge branch 'master' into program-manager_templates
finished templates usertype program-manager