updates for travis integration
Merge branch 'dev' into release/78