Merge branch 'master' of /Users/Xandre/Desktop/AndroidStudio with conflicts.