updated with latest calabash branch updates for UIAutomation