Merge branch 'master' into ask_example

Conflicts:
	scratching.pde
Merge branch 'master' into ask_example

Conflicts:
	scratching.pde
fixes to merge Questions & Trails
Merge branch 'ask_example'