Another commit

test
Merge branch 'master' of https://github.com/greenleafsoftware/StephanieJay

Conflicts:
	StephanieJay/Areas/Admin/Views/Gigs/Edit.cshtml