changed database set_password
touched up app
Merge branch 'master' into georgiana

y