Update master to use OIPA V2.1 API (V3) calls
Merge branch 'master' into openaid-dev

Conflicts:
	constants.php
	project.php