Bootstrapped
Merge branch 'CategoriesBootstrap'

Conflicts:
	TestProject.v11.suo