Use an ARM image on travis instead of x86
Merge branch 'master' into servingMode
Make the tests compile again