Update composer in travis
Merge branch 'master' into feature/requirejs