Creating Conflicts
Merge branch 'master' into newfeat

Conflicts:
	test