Manage user roles
1
Merge remote-tracking branch 'origin/master'

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
Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit 27080a9e5d341ba52a4c65564b5580e414f28c4c.