1.2.0 release
Merge remote-tracking branch 'origin/master'

Conflicts:
	package.json
1.2.0 release
Merge pull request #17 from bleupen/1.2.0-release

1.2.0 release