the code was reviewed
tests were rewrote bcs of changes in the main code
logging chanched as it should be
small fix in code
fixed conflict
Merge branch 'LVWEB-8'