commit fail
Merge branch 'master' of https://github.com/megakevin/TheWall

Conflicts:
	TheWall.Web/App_Data/TheWall.Model.TheWallEntities.mdf
	TheWall.Web/App_Data/TheWall.Model.TheWallEntities_log.ldf
	TheWall.Web/TheWall.Web.csproj
	TheWall.Web/Web.config