Changed modals to bootstrap modals. Added change master password and password policy functionality.
Merge conflict resolved