fixes bottleanimation
fixes bottleanimation
sorts days in calendarview and adds week. hides some buttons in calendarview
fixes conflict
removes login just for now and set pee image animation to scrollvoiew did stop accelerate
merges