bump
Merge branch 'master' into style2

Conflicts:
	package.json