fix oas ticket 90/98
Merge branch 'master' into OAS-dev

Conflicts:
	constants.php
filter option style changes
Merge branch 'master' into OAS-dev
bugfix filter pagination
Merge branch 'master' into OAS-dev
bugfixes, see assembla 9-10 jan
Merge branch 'master' into OAS-dev

Conflicts:
	project.php
Merge branch 'OAS-dev' into OAS-staging