Lunanne/Plasma — pull request #4 by dpogue (2014-05-20 03:58:26+00:00)
Title: Merged Master

Merged master into the tests branch, one conflict in the CMakeLists file from when the 3DSMax plugin was made optional.