update README
Merge branch 'develop' into mockup/dashboard

* develop:
  update README