version 3.1.2
version 3.1.2
take in consideratin port number in the redirect done in BaseModel class
fix #705
take in consideratin port number in the redirect done in BaseModel class
Small fix in Page.php dealing with b_link. Now email templates will be inserted again.
Merge pull request #707 from trains58554/develop

Small fix in Page.php dealing with b_link.
wip
issue #708 mini fix
Merge branch '708' into hotfixes
Merge branch 'hotfixes' into develop

Conflicts:
	oc-includes/osclass/upgrade-funcs.php
Add new base theme
replace default theme in basic_data.sql
New max results per page for Bender theme
Show as Gallery or List if defaultShowAs@search setting is set
issue #713 changed strlen to mb_strlen, remember not to use strlen when using non standard characters
Merge branch 'hotfixes' into develop
added a new hook, related to issue #111
added a missing parameter in geo download url
added a missing parameter in geo download url