edit placeholder for password
allow user to change email and password
fix users form
remove bad code from user office
edit compeition
Merge branch 'feature/filter_email_and_password' into develop

* feature/filter_email_and_password:
  edit compeition
  remove bad code from user office
  fix users form
  allow user to change email and password
  edit placeholder for password
Merge branch 'develop'

* develop:
  edit compeition
  remove bad code from user office
  fix users form
  allow user to change email and password
  edit placeholder for password