Bowling, Entity
Merge remote-tracking branch 'origin/master'

Conflicts:
	Entity/Entity.v12.suo
	Entity/Entity/App_Data/Entity.Models.BlogDatabase.mdf
	Entity/Entity/App_Data/Entity.Models.BlogDatabase_log.ldf