cherry-pick 0.9.x version commit
cherry-pick 72b9ebf5e16539c13020ac5768d7162ee86f071b
pick 5c8f1db3980a5e22ec57cc04f2f5e7862e44b65e
Add scroll to mark operation
backport LPOperations
backport ffb50a23f11bd07385ab2b6c42105cf654264f63
remove flash op made redundant by Frank
Merge remote-tracking branch 'origin/master' into frank-merge

Conflicts:
	calabash.xcodeproj/project.pbxproj
	calabash/Classes/FranklyServer/Commands/LPVersionCommand.h