Merge branch 'master' of https://github.com/Gvinar/InfoMed

Conflicts:
	doc_int/Drugs.aspx.cs
Merge branch 'master' of https://github.com/Gvinar/InfoMed

Conflicts:
	doc_int/Drugs.aspx.cs
Merged with Reverty