Fixed encoder build on OS X and updated to use FBX SDK 2014.1
Merge pull request #1072 from rgngl/encoderMacBuildFix

Fixed encoder build on OS X and updated to use FBX SDK 2014.1
Changed gameplay-encoder to use FBX 2014.1 on Windows
Changed gameplay-encoder to use FBX 2014.1 on Windows and Linux
Merge branch 'next' of https://github.com/seanpaultaylor/GamePlay into next
Merge pull request #1082 from seanpaultaylor/next

Next
Moved the next branch up to now use Visual Studio 2012.
Merge pull request #1085 from seanpaultaylor/next

Moved the next branch up to now use Visual Studio 2012
Update solution files to Visual Studio 2012
Merge branch 'next' of github.com:rcmaniac25/GamePlay into twoD-additions

Conflicts:
	gameplay/gameplay.vcxproj