IN3D/Feudal — pull request #12 by IN3D (2013-12-18 17:50:59+00:00)
Title: Devel/merge test

Cleaned out any conflict errors when merging into devel/mergeTest, this should be a straight forward merge.