more rewrite fixes
Merge branch 'master' into OAS-dev

Conflicts:
	js/projects.js
	projects-description.php