modified views
deleted password
Merge origin/master