Version bump
Version bump
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Publishes the isLocked function
Merge branch 'develop'

Conflicts:
	package.json