added a simple password lock
incremented version for release
Merge branch 'develop'