restored composer.lock to ignores, important to run webdriver on php 5.3
composer removed
fixed incorrect merge
Merge branch '1.7'