Merge pull request #19 from SIB-Colombia/dev

Merging latest dev changes to master branch
Include API support for paramos and humedales
Merge branch 'dev' of https://github.com/SIB-Colombia/catalog-biodiversity-temp-backend

Conflicts:
	protected/config/main.php
	protected/controllers/ApiController.php
Merge branch 'master' into dev

Conflicts:
	protected/config/main.php