Added remember password, forgotten password, search-partiallydone
resolve conflicts between branches
minor fixes