Rebasing branch 'AzureTableStorage' with dev

Conflicts:
	EntityFramework.sln