@begin to add osx support
@add DS_Store to gitignore
@remove fmodex
Merge branch 'v3.1' of github.com:FSource/Faeris into v3.1

Conflicts:
	application/L_Faeris/proj.win32/vs2012/L_Faeris.vcxproj
	lib/lib3rdparty/curl/include/osx/curl/curl.h
	lib/lib3rdparty/curl/include/osx/curl/curlver.h
	lib/lib3rdparty/curl/include/win32/curl/curl.h
	lib/lib3rdparty/curl/include/win32/curl/curlver.h
	lib/lib3rdparty/curl/proj.win32/vs2012/libcurl.vcxproj
	lib/lib3rdparty/curl/src/include/curl/curlbuild.h
	lib/lib3rdparty/curl/src/lib/asyn-ares.c
	lib/lib3rdparty/curl/src/lib/asyn-thread.c
	lib/lib3rdparty/curl/src/lib/base64.c
	lib/lib3rdparty/curl/src/lib/config-os400.h
	lib/lib3rdparty/curl/src/lib/conncache.c
	lib/lib3rdparty/curl/src/lib/connect.c
	lib/lib3rdparty/curl/src/lib/curl_addrinfo.c
	lib/lib3rdparty/curl/src/lib/curl_ntlm.c
	lib/lib3rdparty/curl/src/lib/curl_ntlm.h
	lib/lib3rdparty/curl/src/lib/curl_ntlm_core.c
	lib/lib3rdparty/curl/src/lib/curl_ntlm_core.h
	lib/lib3rdparty/curl/src/lib/curl_ntlm_msgs.c
	lib/lib3rdparty/curl/src/lib/curl_rtmp.c
	lib/lib3rdparty/curl/src/lib/curl_sasl.c
	lib/lib3rdparty/curl/src/lib/curl_sasl.h
	lib/lib3rdparty/curl/src/lib/curl_sasl_sspi.c
	lib/lib3rdparty/curl/src/lib/curl_sec.h
	lib/lib3rdparty/curl/src/lib/curl_setup.h
	lib/lib3rdparty/curl/src/lib/easy.c
	lib/lib3rdparty/curl/src/lib/escape.c
	lib/lib3rdparty/curl/src/lib/file.c
	lib/lib3rdparty/curl/src/lib/formdata.c
	lib/lib3rdparty/curl/src/lib/ftp.c
	lib/lib3rdparty/curl/src/lib/ftplistparser.c
	lib/lib3rdparty/curl/src/lib/getinfo.c
	lib/lib3rdparty/curl/src/lib/gopher.c
	lib/lib3rdparty/curl/src/lib/hostasyn.c
	lib/lib3rdparty/curl/src/lib/hostcheck.c
	lib/lib3rdparty/curl/src/lib/http.c
	lib/lib3rdparty/curl/src/lib/http2.c
	lib/lib3rdparty/curl/src/lib/http_digest.c
	lib/lib3rdparty/curl/src/lib/http_negotiate.c
	lib/lib3rdparty/curl/src/lib/http_negotiate_sspi.c
	lib/lib3rdparty/curl/src/lib/http_proxy.c
	lib/lib3rdparty/curl/src/lib/imap.c
	lib/lib3rdparty/curl/src/lib/krb5.c
	lib/lib3rdparty/curl/src/lib/libcurl.rc
	lib/lib3rdparty/curl/src/lib/multi.c
	lib/lib3rdparty/curl/src/lib/non-ascii.c
	lib/lib3rdparty/curl/src/lib/pingpong.c
	lib/lib3rdparty/curl/src/lib/pipeline.c
	lib/lib3rdparty/curl/src/lib/pop3.c
	lib/lib3rdparty/curl/src/lib/security.c
	lib/lib3rdparty/curl/src/lib/sendf.c
	lib/lib3rdparty/curl/src/lib/setup-os400.h
	lib/lib3rdparty/curl/src/lib/smtp.c
	lib/lib3rdparty/curl/src/lib/socks.c
	lib/lib3rdparty/curl/src/lib/socks_gssapi.c
	lib/lib3rdparty/curl/src/lib/socks_sspi.c
	lib/lib3rdparty/curl/src/lib/ssh.c
	lib/lib3rdparty/curl/src/lib/strdup.c
	lib/lib3rdparty/curl/src/lib/strdup.h
	lib/lib3rdparty/curl/src/lib/strerror.c
	lib/lib3rdparty/curl/src/lib/telnet.c
	lib/lib3rdparty/curl/src/lib/tftp.c
	lib/lib3rdparty/curl/src/lib/transfer.c
	lib/lib3rdparty/curl/src/lib/url.c
	lib/lib3rdparty/curl/src/lib/urldata.h
	lib/lib3rdparty/curl/src/lib/vtls/curl_darwinssl.c
	lib/lib3rdparty/curl/src/lib/vtls/curl_darwinssl.h
	lib/lib3rdparty/curl/src/lib/vtls/curl_schannel.c
	lib/lib3rdparty/curl/src/lib/vtls/cyassl.c
	lib/lib3rdparty/curl/src/lib/vtls/gskit.c
	lib/lib3rdparty/curl/src/lib/vtls/gskit.h
	lib/lib3rdparty/curl/src/lib/vtls/gtls.c
	lib/lib3rdparty/curl/src/lib/vtls/gtls.h
	lib/lib3rdparty/curl/src/lib/vtls/nss.c
	lib/lib3rdparty/curl/src/lib/vtls/nssg.h
	lib/lib3rdparty/curl/src/lib/vtls/openssl.c
	lib/lib3rdparty/curl/src/lib/vtls/openssl.h
	lib/lib3rdparty/curl/src/lib/vtls/polarssl.c
	lib/lib3rdparty/curl/src/lib/vtls/polarssl.h
	lib/lib3rdparty/curl/src/lib/vtls/qssl.c
	lib/lib3rdparty/curl/src/lib/vtls/qssl.h
	lib/lib3rdparty/curl/src/lib/vtls/vtls.c
	lib/lib3rdparty/curl/src/lib/vtls/vtls.h
	lib/lib3rdparty/curl/src/lib/x509asn1.c
	lib/lib3rdparty/curl/src/lib/x509asn1.h
	lib/libfaeris/proj.win32/vs2012/faeris.vcxproj
	lib/libfaeris/src/media/platform/FsFmodPlayer.cc