Merge branch 'onlyjob-master'

Conflicts:
	composer.json

diff --cc composer.json
index 4a3e49b29e9bf993f7b0a16f984a98969a3f25db,98f8366e3d5d67410416f83a08c58d3bc8df3659..0b54273098730ff9b7d92df9f970be76d41bbd21
--- 1/composer.json
--- 2/composer.json
+++ b/composer.json
@@@ -9,8 -9,7 +9,8 @@@
      "dompdf/dompdf" : "0.6.*",
      "symfony/dependency-injection": "2.3.*",
      "symfony/event-dispatcher": "2.3.*",
-     "psr/log": "1.0.0",
 +    "symfony/process": "2.3.*",
+     "psr/log": "~1.0.0",
      "symfony/finder": "2.3.*",
      "totten/ca-config": "~13.02"
    },