CMAPI/cmapi.github.io — pull request #3 by GeoSteve (2014-08-15 12:14:03+00:00)
Title: Merge of master into development

Just merged the extra three commits from master back down into development, to keep it up to date.