The "wip" branch
Merge branch 'master' into wip
error reporting for dev
Corrections in gitignore and Sami configuration
Merge branch 'wip'
Master branch gitignore
Merge branch 'master' into dev
Updating documentation