merged with origin
Merge branch 'First' of https://github.com/The-fellowship-of-the-Sharp/PrColectiv2014 into First

Conflicts:
	GraveyardManagement/GraveyardManagement.csproj
models for Mormant and Graveyard