Resync repo
Merge branch 'master' of github.com:gubi/Ninuxoo-2.0
Updated not working travis