Merge branch 'master' into develop

* master:
  updated avatar
too lazy to fix it correctly, for now.
Merge branch 'develop'

* develop:
  too lazy to fix it correctly, for now.