Merge branch 'dev-master' into controlling

Conflicts:
	.gitignore