1111
Merge branch 'master' of https://github.com/katrine2013/VCards

Conflicts:
	VCardsDbConnection/App.Config
	VCardsDbConnection/Dbdmx.Context.tt
	VCardsDbConnection/Dbdmx.Designer.cs
	VCardsDbConnection/Dbdmx.edmx.diagram
	VCardsDbConnection/Dbdmx.tt
	VCardsDbConnection/VCardsDbConnection.csproj
	VCardsMVC4/Controllers/HomeController.cs
	VCardsMVC4/Web.config