Merge branch 'master' of C:\Users\Lorenzo\AndroidStudioProjects\uMorning with conflicts.
fixes