checkin
Merge branch 'master' of github.com:m6deep/Xenon-Framework
updated travis config