Revert "Revert "Merge remote-tracking branch 'origin/master'""

This reverts commit 235665d8078746f486a4706aed21245f1fe267ff, reversing
changes made to 27080a9e5d341ba52a4c65564b5580e414f28c4c.
Fixing merge issues

Conflicts:
	.gitignore
	App_Data/aspnet-HickoryPTASite-3c4853da-4bcb-4c71-9d3d-4ef695b566c4.mdf

	App_Data/aspnet-HickoryPTASite-3c4853da-4bcb-4c71-9d3d-4ef695b566c4_log.ldf
	HickoryPTASite.v12.suo