Merge branch 'wienCalendar'
Merge branch 'master' of https://github.com/finninde/fellesprosjekt