Completed logging framework

1. Completed logging framework
2. Fixed minor issues ( cache clear, stale reference and noresults
found)
Resolved Conflicts