Initial commit
Merge remote-tracking branch 'github/master' into develop

Conflicts:
	.gitignore