added CIMbased bundles again!! :-)
Merge branch 'linux' of https://github.com/asterics/AsTeRICS into linux