CMake generation fromt eh new project template shell script
Revert "CMake generation fromt eh new project template shell script"
Merged to Next branch

This reverts commit f308616452cec71604e417b0799296053d9b31bd.
Fixed Android bug with hardcoded asset path
Removed additional package name
Merge branch 'master' of https://github.com/blackberry/GamePlay
Merge remote-tracking branch 'upstream/next' into next
Merge pull request #788 from blackberry/master

Rebase master to next
Merge branch 'master' of https://github.com/blackberry/GamePlay
Merge pull request #791 from blackberry/master

master to next
added windows support for toggling sampling at runtime, and stubs for other platforms + lua bindings
Merge branch 'next' of github.com:blackberry/GamePlay into next
Fixes compile error with DebugMem on Linux
Added multisampling support on Linux
Merge pull request #799 from blackberry/master

Merged master to next
Moved #include <typeinfo> to Base.h
Merge pull request #804 from marcinjakubowski/next

Android asset path fix + debug mem Ref include fix for gcc + Linux multisampling support
Merge pull request #803 from reven86/next-clean

fixed blend state typo, all blend states can be parsed
Merge pull request #805 from blackberry/master

Merge master to 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