wip
Merge branch 'master' into new_logs
store both logs in a same file, as JSON
add legacy support
add debug and simplify docker logs
Merge pull request #1211 from dotcloud/new_logs

*Runtime: Logs are now synchronised