20130806
Merge branch 'master' of github.com:vaidasgit/MedInfo

Conflicts:
	MedInfo.WebApp/MedInfo.WebApp.csproj
	MedInfo.WebApp/Web.config
	MedInfo.WebApp/packages.config