Merge "Added Calipso as submodule"