qml menu added
password fix
Merge remote-tracking branch 'refs/remotes/origin/BogdanovQmlMenu' into QML-dev

Conflicts:
	ClientServerApp/Users.s3db