Fixed merge problem
Fixed merge + log4net and logentries
Logging to logentries