Merge branch 'develop_integration_w08' into 'develop'
Develop integration w08 Summary of changes: - various bugs fixed - pre-commit script for better indentation: see commit 068ce4ca For the moment, each contributor has to enable the script (and install astyle) by hand. Maybe at some point the script will be mandatory. See merge request !124
Showing with 2168 additions and 1786 deletions