Merge branch 'master' of github.com:acado/acado
Merge branch 'master' of github.com:mvukov/acado
Merge branch 'master' of github.com:mvukov/acado
Merge branch 'master' of github.com:mvukov/acado
Merge branch 'master' of github.com:mvukov/acado
Merge branch 'master' of github.com:mvukov/acado
Updated .travis.yml