merged password fix and getStorageService fix from develop
Merge pull request #36 from SlavD/2013.07

merged password fix and getStorageService fix from develop
Merge remote-tracking branch 'upstream/2013.07' into 2013.07