Merge pull request #5 from ZdenekM/indigo-devel

CloudAssembler: parameters, nodelet version
Compilation issue fixed.
Name of include directory fixed.
Merge pull request #6 from ZdenekM/hydro-devel

Backport of changes from indigo branch