Merge branch 'master' into production

Conflicts:
	dowsing-js
	tutorial/index.php
Update save.php so that it will work on server.
Merge branch 'production' into usability-testing

Conflicts:
	dowsing-js