Bug 998874 - [marionette-apps] Update dependency of marionette-js-client
to 1.1.5.
 - Extend the timout in waitforapp_test.js to 20s.
 - Modify the depency of marionette-js-client as peerDependencies.
Merge pull request #26 from RudyLu/test_dep_client115

Bug 998874 - [marionette-apps] Update dependency of marionette-js-client to peer dependency 1.0.0.
r=evanxd.