bugfix filter pagination
Merge branch 'master' into OAS-dev
bugfixes, see assembla 9-10 jan
Merge branch 'master' into OAS-dev

Conflicts:
	project.php