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

Conflicts:
	doc_int/Site.Master
Attempt to merge again after failed merge with Reverti
Merge branch 'master' of https://github.com/Gvinar/InfoMed

Conflicts:
	MobileWebApi/Infrastructure/NinjectControllerFactory.cs
	ServerConsole/Binder.cs
	ServerLogic/Logger/FileLogger.cs
	TestConsole/Binder.cs
	doc_int/Binder.cs
	doc_int/Drugs.aspx
	doc_int/Drugs.aspx.cs
	doc_int/Site.Master
Merge branch 'master' of https://github.com/Gvinar/InfoMed
ToolTips have been added
Showing dates in format DateTime when try to save
Merged selenne_Annette and Gvinar