Merge branch 'laitiju' into map
[situare] / src /
drwxr-xr-x   ..
drwxr-xr-x - facebook_service
drwxr-xr-x - gps
-rw-r--r-- 1006 main.cpp
drwxr-xr-x - map
drwxr-xr-x - situare_service
-rw-r--r-- 1597 src.pro
drwxr-xr-x - ui