styles; deletes
fixec omms error
ok
Merge branch 'upgrade' into develop

* upgrade:
  ok
  fixec omms error
  styles; deletes