Merge branch 'master' of C:\Users\Sergio\AndroidStudioProjects\D2counter with conflicts.
teamPick