Merge branch 'master' of https://github.com/worklist/hifi

interface/src/Application.cpp

@@ -774,10 +774,10 @@ void Application::readSettingsFile() {
                 }
             }
         }
-    }
     
         fclose(settingsFile);
     }
+}
 
 void Application::saveSettingsFile() {
     FILE* settingsFile = fopen(AVATAR_DATA_FILENAME, "wt");

libraries/shared/src/SharedUtil.h

@@ -10,6 +10,7 @@
 #define __hifi__SharedUtil__
 
 #include <stdint.h>
+#include <unistd.h>
 #include <math.h>
 
 #ifdef _WIN32