Merge branch 'master' into jskia73
-rw-r--r-- 283 .gitignore
-rw-r--r-- 18092 LICENSE
drwxr-xr-x - debian
drwxr-xr-x - doc
drwxr-xr-x - release
drwxr-xr-x - res
drwxr-xr-x - scripts
-rw-r--r-- 180 situare.pro
drwxr-xr-x - src
drwxr-xr-x - tests
drwxr-xr-x - usr