.
Merge branch 'development' of github.com:jarno-steeman/onion into development

Conflicts:
	bower.json
	dist/onion.js
	dist/onion.js.map
	package.json