Removed composer.lock from Git as it seems to cause more problems including it
than leaving it out.
Merge remote-tracking branch 'origin/master'