manual scan layout update
libs and .gitignore updates
Merge remote-tracking branch 'origin/master'