Merge branch 'master' into develop

Conflicts:
	src/app/FAKE/app.config