Merge remote-tracking branch 'origin/templates' into event-creation
added calendar title to dashboard
allowed creation of event instances
PEP8 and changed id to be more specific
Merge event-creation