Merge remote-tracking branch 'upstream/next' into next
Fixing resource copy
added linking of pthread to be able to compile on latest archlinux and latest gcc
Merge remote-tracking branch 'upstream/next' into next
added windows support for toggling sampling at runtime, and stubs for other platforms + lua bindings
Merge pull request #799 from blackberry/master

Merged master to next
Merge pull request #805 from blackberry/master

Merge master to next
Merge remote-tracking branch 'upstream/next' into next
Merge remote-tracking branch 'upstream/next' into next
adding multisampling getter/setter methods for MacOSX and iOS, and ensuring multisampling is initially true if samples is > 0 in config
Merge pull request #816 from blackberry/master

Merge master to next
Merge pull request #817 from blackberry/master

Merge master to next
Merge pull request #819 from blackberry/master

Merge master to next
Merge pull request #823 from blackberry/master

Merge master to next
Added a non-templated "add" method to MeshBatch so Lua can call MeshBatch::add()
Also updated the lua bindings.
Merge pull request #824 from dgough/next

Added a non-templated "add" method to MeshBatch so Lua can call MeshBatch::add()
Merge pull request #806 from johnbrandle/next

Next
Merge branch 'next' of https://github.com/blackberry/GamePlay into next

Conflicts:
	gameplay-samples/CMakeLists.txt
	gameplay-tests/CMakeLists.txt
Fixed copying recursive res files in new project cmake file
Merge pull request #830 from blackberry/master

Merged master to next