fix edit user and assets validation
Merge remote-tracking branch 'alex/develop' into develop

* alex/develop:
  fix edit user and assets validation
fixed overriden files for the 1513 fix
Changed validation on add assets for cycle1 test