fix modal code
Merge branch 'master' into accounts-admin

* master:
  fix modal code
user admin changes, delete unneeded file