Merge pull request #16 from gaye/bug-958252

Bug 958252 - Implement MarionetteHelper#waitForChild
Bug 956668 - Add tapSelectOption method for Gaia r=EragonJ