#1 removed config.json and added to .gitignore
Merge branch 'master' into develop

Conflicts:
	.gitignore