1.0.0
1.0.0
Merge branch '1.0.0'

Conflicts:
	package.json