Merge branch 'dev' of http://apps/git/navitia into dev