Initial commit
Merge commit 'd3a12da57cc28eb137ab0e1738810a367b61fa2a' into develop

Conflicts:
	.gitignore
	README.md