bump
actual bump (doh)
Merge remote-tracking branch 'origin/master' into development

Conflicts:
	dist/onion.js
	dist/onion.js.map