Just moving projects around to make more sense of things.
Merge branch 'master' into feature/management

Conflicts:
	Noodle.sln