Merge branch 'master' into clearSelection

* master:
  Clarify vision and development best practices