Merge branch 'master' into login_browser

diff --cc src/facebookservice/facebookauthentication.cpp
Simple merge

diff --cc src/situareservice/situareservice.cpp
index 517758f,ed789ad..87847c4
--- 1/src/situareservice/situareservice.cpp
--- 2/src/situareservice/situareservice.cpp
+++ b/src/situareservice/situareservice.cpp
@@@ -19,8 -19,9 +19,8 @@@
     USA.
  */
  
- #include "parser.h"
+ #include <qjson/parser.h>
  
 -#include <QtAlgorithms>
  #include <QDebug>
  #include <QNetworkReply>
  #include <QPixmap>

diff --cc src/src.pro
Simple merge