Include latest API changes for humedales and paramos
Merge branch 'master' into dev

Conflicts:
	protected/config/main.php