Develop.mergewithcalabashmaster

And fixes to take account of changes to robotium framework