ich hasse dieses tool!
Merge branch 'jemproject-master'

Conflicts:
	site/views/categories/tmpl/default_table.php
ich hasse dieses tool!
Merge branch 'develop' into feature/page-heading

Conflicts:
	site/views/categories/tmpl/default_table.php
complete incomplete merge
Merge branch 'develop' into feature/page-heading
Merge branch 'jemproject-master'
Merge branch 'develop' into feature/page-heading
adapt frontend titles and headings (3) (issue #566)
altered frontend views attendees, calendar, categories, category, day, eventslist, myattendances, myevents, myvenues, search, venue, venues, weekcal
removed feed from search, categories, venues
Implemented JEMCategories::getParentlist() (issue #566 related)
(used in frontend category view to build pathway)
Merge pull request #593 from Hoffi1/feature/page-heading

Hoffi1:feature/page heading (3)