restructuring and cleanup from prototype
Merge branch 'master' of https://github.com/CMAPI/cmapi.github.io

Conflicts:
	index.html