Merge branch 'testing' into master

Conflicts:
	.gitignore