Merge branch 'release/0.7.1' into develop
Bumped version
Merge branch 'release/0.6.11'
Merge branch 'release/0.6.11' into develop
Merge branch 'origin/develop'

Conflicts:
	package.json
Bumped version
Merge branch 'release/0.7.2'
Merge branch 'origin/master'