Now error reporting for master branch
New error reporting for master
Corrections in gitignore and Sami config
No dev files for master
Merge branch 'master' into dev
Updating documentation