Merge branch 'master' of github.com:dariushha/cpptester into develop

Conflicts:
	README.md
	demo
Merge branch 'develop'
Test project is synced with its remote core repo
Merge branch 'develop'