export fixes
call fixes
Merge branch 'master' into openaid-dev

Conflicts:
	constants.php