Devel

Fixes all test failures und cmake 2.8.7 linux.  

This commit will be the basis for future pull requests the devel branch will be retired