Fuck this
Merge branch 'master' of https://github.com/KitsuneX/FPSS

Conflicts:
	FPSS/Assembly-CSharp-vs.csproj
	FPSS/Assets/Textures.meta
	FPSS/FPSS-csharp.sln
	FPSS/FPSS.sln
	FPSS/Library/AssetServerCacheV3
	FPSS/Library/CurrentLayout.dwlt
	FPSS/Library/CurrentMaximizeLayout.dwlt
	FPSS/Library/ScriptAssemblies/Assembly-CSharp.dll
	FPSS/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	FPSS/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll.mdb
	FPSS/Library/ScriptAssemblies/Assembly-UnityScript.dll
	FPSS/Library/assetDatabase3
	FPSS/Library/expandedItems
	FPSS/Library/guidmapper
	FPSS/Library/metadata/01/010c41ed5ee7ce340a90b7d43b63ac53
	FPSS/Library/metadata/02/0239706aa1af23c488234e115a5f33a2
	FPSS/Library/metadata/04/0489dd6c88761af4d82ed461ecdbc1ea
	FPSS/Library/metadata/05/0559ae8a0acba4f4a8e4bf6510ca1225
	FPSS/Library/metadata/05/05ab4d313f4fd664c981a31c7033854c
	FPSS/Library/metadata/0a/0a0517c8f07c047f2965315b8dac81aa
	FPSS/Library/metadata/0d/0d64cf85603324c6d89204084bbb3438
	FPSS/Library/metadata/0e/0e76ce97295def641a79ca441092ed3f
	FPSS/Library/metadata/11/118d95857dd194a4e8b4569b2752b2bd
	FPSS/Library/metadata/11/11c4ba8ad33096345ac63015b92a4b1f
	FPSS/Library/metadata/11/11d332b40dcf8a740872604ed80bc27d
	FPSS/Library/metadata/14/14473f8b47a88b64a9a79980f7955222
	FPSS/Library/metadata/1b/1bf34b610fe6f466faff3dcd833c06f6
	FPSS/Library/metadata/1e/1e3cbdfe3644f44aeb1c053d96cc254e
	FPSS/Library/metadata/24/24f8b7f726c7047cb906be889dbf5ac1
	FPSS/Library/metadata/25/2556c256a5f204745b05052ff1f78fa9
	FPSS/Library/metadata/29/2983db8fb9b166944b1feb01e91b7b69
	FPSS/Library/metadata/2c/2c593c35b7aa53a4cbe4a8c2d575386c
	FPSS/Library/metadata/2c/2cd43bf812c55024a96781f3d2b2064d
	FPSS/Library/metadata/2d/2dafd9159dac7d14cb3a15e242b7e072
	FPSS/Library/metadata/2f/2fee2be3fb9aea349a0f54e147f110c2
	FPSS/Library/metadata/35/356d385a59c53487ebe6e3363ff4ffa2
	FPSS/Library/metadata/36/3690cf0e9ca5d214588c997e93d759d2
	FPSS/Library/metadata/37/370c1f13648641b4e9e3341880bc58be
	FPSS/Library/metadata/3c/3c5bb2bad5622497490fdbd0f36e9674
	FPSS/Library/metadata/3f/3f5ccb1904323cd4b9d71db795a572a2
	FPSS/Library/metadata/40/406b19ff437454d4c94c96d4b369ccd1
	FPSS/Library/metadata/42/42db38f3f37cf1b42b1c0b2d6f65f490
	FPSS/Library/metadata/46/46e871058d317418fab60bb84a290869
	FPSS/Library/metadata/49/49ba034ecaf7b454487e536be9096c14
	FPSS/Library/metadata/4a/4a5bb11dfec525d4ba4e046827fcf2c2
	FPSS/Library/metadata/4a/4aa94d6a19b801546b236d45931b4963
	FPSS/Library/metadata/4b/4be6e9892d0f70947b28d758451a930d
	FPSS/Library/metadata/4c/4ca8e16c3e0ab45e69aef7738ef77d3a
	FPSS/Library/metadata/4f/4f71e9a130dfdd646aa67e7886f4ce54
	FPSS/Library/metadata/51/510306bf62c654a548c9d0193dbedd8e
	FPSS/Library/metadata/52/521895bf6af5b974aae3e319d0d756ef
	FPSS/Library/metadata/52/52ace5fc98cdbfa4ca578286febe9f41
	FPSS/Library/metadata/52/52b0ef61ffe23cb4abbe2f68cd6e4969
	FPSS/Library/metadata/56/569afc0b1e1e78b49a5f9ac701ac15de
	FPSS/Library/metadata/58/5827952fa49b34641bd64af4e6deb26e
	FPSS/Library/metadata/5a/5a09dad89d11389ed000e82b8d76c639
	FPSS/Library/metadata/60/607426a9820414bfd8081fb22854dbd4
	FPSS/Library/metadata/61/6134a184b1d49498fb473b6276533784
	FPSS/Library/metadata/63/63e618e4b55634c8fb3bf5c5cd6679ea
	FPSS/Library/metadata/63/63eff7ded158dc74191be52079585151
	FPSS/Library/metadata/69/6925e95454343394d95391da4cafca19
	FPSS/Library/metadata/69/698ec8abdf2731c428603c22d6d51635
	FPSS/Library/metadata/6b/6b801bc9d04f123488adba360db88efc
	FPSS/Library/metadata/6b/6ba36f1456b87004f83b53f8c2815bf3
	FPSS/Library/metadata/6d/6d4fd495600cd4cf0b8ad2caf025f94e
	FPSS/Library/metadata/72/72a5c674ae97c4b408231c82b6524a51
	FPSS/Library/metadata/75/75e5fd5b2f02e434e93b813d866ef0b9
	FPSS/Library/metadata/75/75f57e302cf33a3418a51a72391319e7
	FPSS/Library/metadata/79/794a3489a6afd4daf80d98a5844341b9
	FPSS/Library/metadata/7d/7d4f98ad58a27174aa63f0a74748850a
	FPSS/Library/metadata/7d/7d5b46642debd6d49bb1bed4110f6002
	FPSS/Library/metadata/7e/7eb27a7f6c31f9b4695324aaee00d23e
	FPSS/Library/metadata/81/818ecebdaafd81d47bbf02076f26f19b
	FPSS/Library/metadata/85/85cde262bee344ae28a0bf86762219ac
	FPSS/Library/metadata/85/85e2cd553a3a6054cbb5d05309703dbf
	FPSS/Library/metadata/86/8668f96cc207b4965afadab0edade16a
	FPSS/Library/metadata/86/86a73d08986820a44ac93c49b97020ac
	FPSS/Library/metadata/87/87bda320592b4ff48be26df6c672e975
	FPSS/Library/metadata/8a/8af0f21f411904d65a90f87110818a7e
	FPSS/Library/metadata/8c/8c1f929571ef549619212d9405d4f923
	FPSS/Library/metadata/8c/8c75dadc1f18e42f5be29942a71d83c4
	FPSS/Library/metadata/90/90f30cecc54819b46895d5a12193be82
	FPSS/Library/metadata/91/915ad9ca3655e5b4aa64739a28467d84
	FPSS/Library/metadata/92/92722830d4a3f49e5bf7e68441337edb
	FPSS/Library/metadata/93/937bbaa798b51a54bb67dcad7060294d
	FPSS/Library/metadata/96/96173aec03909c94ebcddfaaf1fdabd4
	FPSS/Library/metadata/96/969d0954c14975f4eb26530da1b0b329
	FPSS/Library/metadata/97/97593109f34de48109618fb5687a88b8
	FPSS/Library/metadata/99/9919571acca1dac4ebda873c9bed6186
	FPSS/Library/metadata/9b/9b9106e5cf82342e78e4fcc288becd41
	FPSS/Library/metadata/9e/9e306f5e5f15c5b4abccd12305145fb8
	FPSS/Library/metadata/9e/9ef50104b12ed4ca9bed40f105986cd7
	FPSS/Library/metadata/a2/a26585fe4ac203d4ea4b05fcff4bf999
	FPSS/Library/metadata/a4/a4e9cd1ea83b9e94891e91cc2b66f7d6
	FPSS/Library/metadata/a4/a4f0230b862d21247a25fc7c3f2c122e
	FPSS/Library/metadata/aa/aadd99b5f57c2486b98d31bcbb5c640e
	FPSS/Library/metadata/ab/ab90c5d984b4d4e9e935ae8760fd47ef
	FPSS/Library/metadata/ab/abaa2591867a28d4eafd15461eaa9765
	FPSS/Library/metadata/b7/b71d1c03541de594fb383fd17135ed87
	FPSS/Library/metadata/bb/bb1ac143cc0ea0d4bba9dcfc9e5c8ef6
	FPSS/Library/metadata/be/be1f8ea547040734b97e0aac19e74b14
	FPSS/Library/metadata/c2/c213bc21149c2f043b91b836e816c732
	FPSS/Library/metadata/c7/c737c438ada61c64db693ab5b7efbfd9
	FPSS/Library/metadata/ca/caa1ec025a7c049ec8f67b889fb33a6d
	FPSS/Library/metadata/ca/cad4fe3deabb0452e9a372244c25287c
	FPSS/Library/metadata/cd/cd2c9fdbae11ba54c8ccacf3737bc299
	FPSS/Library/metadata/d1/d1e47baf2e9cf5f428181801a8f701e7
	FPSS/Library/metadata/d4/d4a21561a348cce489b9d4f3f84c6a08
	FPSS/Library/metadata/d5/d5396a3251db948279e0c7262385dafe
	FPSS/Library/metadata/d5/d5d58c10e934a4738aa90eb4e904a166
	FPSS/Library/metadata/d8/d8cfa4746d26d4715b9f848bce1e2f14
	FPSS/Library/metadata/d9/d93543f5d90565a499b1f33a4d537e2f
	FPSS/Library/metadata/da/da002d5e347b152439eba83c347ef9e9
	FPSS/Library/metadata/da/daf8ab28ea6df4773bf38cb9e3e173e1
	FPSS/Library/metadata/de/de27fd4e43cdc6840aea6af5599b158f
	FPSS/Library/metadata/df/df42ef794d3e0441783057cf822a525c
	FPSS/Library/metadata/e0/e02bf8d8fe18948ea8ce546b6a32bee5
	FPSS/Library/metadata/e3/e39aac962a1fcb443a9c9c3fe36c7612
	FPSS/Library/metadata/e8/e81be126bfb11e64e8eb8bbc04afa087
	FPSS/Library/metadata/e8/e83c2f831bb0fd14b92751cdcbe823ec
	FPSS/Library/metadata/e9/e9b2eead3d2f84ce19c1d65f1dbf66f9
	FPSS/Library/metadata/f0/f01839f10410d144baeb961c01df7101
	FPSS/Library/metadata/f4/f476cc8c5040efc44977285d57517bfe
	FPSS/Library/metadata/f9/f94363ea6aa914c4a93aeba06ae8a0df
	FPSS/Library/metadata/fd/fd985e98469153e40a02715cc7fe03b7
	FPSS/Library/metadata/ff/ff063c9db7e6e467d86d376ff5be5ca0