Merge pull request #2 from jemproject/master

Merge from jemproject/master, 1.9.5.514-internal
Merge remote-tracking branch 'origin/master' into development
Merge pull request #4 from jemproject/development

Merge from jemproject/development 1.9.5
identical - seems to be lineending problem
merge from develop
Don't need these useless CRs at end of lines
alter frontend views a* - d* for conform page heading/title (issue #566)

- add support for J! 2.5 menu item params page title, page heading, show
page heading
- handle menu link vs. other link
- rename $item to $menuitem when it is a menu item
- set version to 1.9.6 on changed files
- some more minor changes...
all changes incl. 2014-01-29 from jemproject-master
all changes incl. 2014-01-29 from jemproject-master
Merge branch 'master' into develop
Merge branch 'develop' into feature/page-heading

Conflicts:
	site/views/categories/tmpl/default.php
	site/views/categories/view.html.php
	site/views/categoriesdetailed/tmpl/default.php
	site/views/categoriesdetailed/view.html.php
Merge branch 'master' into develop
Merge branch 'develop' into feature/page-heading

Conflicts:
	site/views/attendees/tmpl/default.php
adapt frontend titles and headings (2) (issue #566)

altered frontend views attendees, calendar, categories, category, day,
eventslist, myattendances, myevents, myvenues
Update .gitattributes

revert, doesn't help
Merge pull request #578 from Hoffi1/feature/page-heading

Feature/page heading - issue #566 first views
Fix PHP error introduced with code for #577
Added "protected" modifier to functions beginning with underscore
Added "public" modifier to constructors
added country-default to editvenue (front), FIX #580
added Geocomplete to credits