Merge branch 'master' into develop

# Conflicts:
#	src/gestures.c
#	src/makefile

src/gestures.c

@@ -39,6 +39,7 @@
     int __stdcall QueryPerformanceCounter(unsigned long long int *lpPerformanceCount);
     int __stdcall QueryPerformanceFrequency(unsigned long long int *lpFrequency);
 #elif defined(__linux)
+    #include <sys/time.h>       // Declares storage size of ‘now’
     #include <time.h>           // Used for clock functions
 #endif