Merge branch 'master' into 'xcos-layout'
-rw-r--r-- .gitignore
drwxr-xr-x SEP
drwxr-xr-x git_hooks
drwxr-xr-x scilab