Merge branch 'FMODStudio'

Conflicts:
	indra/cmake/PNG.cmake
	indra/newview/llnetmap.cpp
	indra/newview/llviewermessage.cpp



PARAMETERS: CLEAN

indra/llimage/llpngwrapper.h

@@ -30,8 +30,12 @@
 #include <png.h>
 #else
 // Workaround for wrongly packaged prebuilt.
+#if _MSC_VER >= 1800
+#include <libpng16/png.h>
+#else
 #include "libpng15/png.h"
 #endif
+#endif
 #include "llimage.h"
 
 class LLPngWrapper