restore some old code
Merge remote-tracking branch 'origin/master' into development

Conflicts:
	core/extension.js
.
Merge branch 'development' of github.com:jarno-steeman/onion into development

Conflicts:
	bower.json
	dist/onion.js
	dist/onion.js.map
	package.json
Merge remote-tracking branch 'origin/master' into development

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