Devel/merge test

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