ask password api for regular
resolve merge conflicts
Merge branch 'master' of github.com:Shvarts/Cashhoppers