Merge branch 'master' of /Users/manuelbraun/AndroidStudioProjects/RobotRemote with conflicts.