warning symbols
Merge branch 'symbols'
Merge branch 'master' into integrate

Conflicts:
	public/index.html
properly async the things that do things