Merge branch 'master' into develop
JARVIS-332 Updated README.md
Merge branch 'master' into develop

Conflicts:
	README.md
Merge pull request #14 from joola/develop

JARVIS-332 Updated README.md