style changes
Merge branch 'develop' into staging

* develop:
  style changes