Merge remote-tracking branch 'origin/master' into JIMS 12/12412/1
-rw-r--r-- .gitignore
drwxr-xr-x SEP
drwxr-xr-x git_hooks
drwxr-xr-x scilab