qa
Merge remote-tracking branch 'origin/dev' into qa

Conflicts:
	README.md
Merge pull request #1 from Incindio/qa

Qa