Updated Calabash to latest version
Merge branch 'calabash_latest_version' into my_changes

* calabash_latest_version:
  Updated Calabash to latest version