Updated to be conform to API v3 call changes
Merge branch 'master' into openaid-dev

Conflicts:
	js/indicators.js
	project.php