Merge branch 'master' into stage
1.2.0
Merge branch 'master' into stage
1.2.0

Conflicts:
	package.json
1.2.1
Merge branch 'master' into stage
Merge branch 'stage' into production