Travis-CI yml
Merge branch 'develop' of github.com:JulianSchuette/ConDroid into develop