Classes & Modules
Merge remote-tracking branch 'origin/master' into develop

* origin/master:
  Classes & Modules

Conflicts:
	README.md