* fixed issue of getting conflict errors when in high load (removing possible duplicate rowkey + partitionkey issue)
Merge remote-tracking branch 'upstream/master'

Conflicts:
	NLog.Extensions.AzureTableStorage/LogEntity.cs
* addressing rowkey search / default sort order issue.
resolve merge conflict
Merge branch 'ericlau-solid-master'
Add test for including a GUID and a Time Component in Row Key