Merge branch 'dev'
4.33.1
Fix for carrige returns in wiki
fetching branches reference
4.33.3 - On touch handler for nodes
Touch issue
Merge branch 'dev'

Conflicts:
	app.yaml
	cache_key.py
	main.py
m
Merge branch 'master' into dev