Merge branch 'master' into OAS-dev
white labeled OAS
Merge branch 'master' into OAS-dev
Merge branch 'master' into OAS-dev
Merge branch 'master' into OAS-dev
hide buttons
hide buttons
Merge branch 'master' into OAS-dev
25 activities per page
Merge branch 'master' into OAS-dev
lightbox style fix
Merge branch 'master' into OAS-dev
Merge branch 'master' into OAS-dev
Merge branch 'master' into OAS-dev
Merge branch 'master' into OAS-dev
update reporting organisations for OAS
Merge branch 'master' into OAS-dev
Merge branch 'master' into OAS-dev

Conflicts:
	js/projects.js
	projects-description.php
update site_url
Merge branch 'master' into OAS-dev