small updates
Merge branch 'master' of github.com:openplanets/scape-demo-sites

Conflicts:
	StyleJS/css/style.css
	Templates/check.php