default Umbraco 7.1.2 install
Merge branch 'master' of https://github.com/knoppj/TestStore

Conflicts:
	TestStore/TestStore.csproj
	TestStore/Web.config
	TestStore/config/ClientDependency.config