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

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

Conflicts:
	project.php