+ initial version
Merge branch 'master' of https://github.com/openplanets/scape-demo-sites

Conflicts:
	matchbox/check.php
	matchbox/index.html
+ syntax changes for matchbox
merging HEAD
+ new version of matchbox demo presentation.
Merge branch 'master' of https://github.com/openplanets/scape-demo-sites