Implementation of group passwords
new layout files for group password dialogs
Fixed minor merging conflicts in strings.xml