Merge branch 'master' into develop
1) added logs
2) deleted dead code
Merge branch 'develop'