Merge branch 'master' into network_handler

diff --cc src/src.pro
index 244baf8,a16a414..d4eaa6a
--- 1/src/src.pro
--- 2/src/src.pro
+++ b/src/src.pro
@@@ -98,10 -99,10 +99,11 @@@ HEADERS += common.h 
      ui/sidepanelbase.h \
      ui/zoombutton.h \
      ui/zoombuttonpanel.h \
-     user/user.h
+     user/user.h \
+     ui/fullscreenbutton.h
  QT += network \
      webkit
 +
  DEFINES += QT_NO_DEBUG_OUTPUT
  
  simulator {