updated travis tml and some views
fixed merge conflicts