draustumas bug#1
importas is TLK
Merge branch 'master' of https://github.com/vaidasgit/MedInfo

Conflicts:
	MedInfo.WebApp/Site.Master
resolve2