modified some templates
merged from templates branch
added check for until if interval is set
updated from master
Merge remote-tracking branch 'origin/templates' into event-creation
viewport meta tag in document header
Merge remote-tracking branch 'origin/master' into templates
Merge EventInstance occurence updates