resolve conflict

app/build.gradle

...a/id/ac/ui/cs/myui/AttendanceHistoryInstrumentedTest.java

...est/java/id/ac/ui/cs/myui/AttendanceInstrumentedTest.java

...dTest/java/id/ac/ui/cs/myui/BookmarkInstrumentedTest.java

...va/id/ac/ui/cs/myui/CalendarActivityInstrumentedTest.java

...va/id/ac/ui/cs/myui/KalenderAkademikInrtrumentedTest.java

...st/java/id/ac/ui/cs/myui/PanicButtonInstrumentedTest.java

app/src/main/AndroidManifest.xml

...java/id/ac/ui/cs/myui/activity/epic_1/DrawerActivity.java

...ui/cs/myui/activity/epic_1/calendar/CalendarActivity.java

...myui/activity/epic_1/calendar/CalendarDetailActivity.java

.../cs/myui/activity/epic_1/calendar/MyCalendarActivity.java

...ui/cs/myui/activity/epic_1/news/BookmarkNewsActivity.java

...c/ui/cs/myui/activity/epic_1/news/NewsDetailActivity.java

.../ac/ui/cs/myui/activity/epic_1/news/NewsHomeActivity.java

...d/ac/ui/cs/myui/activity/epic_2/MyBounceInterpolator.java

...d/ac/ui/cs/myui/activity/epic_2/NotificationActivity.java

...id/ac/ui/cs/myui/activity/epic_2/PanicButtonActivity.java

...i/activity/epic_2/attendance/PresenceHistoryActivity.java

...ui/activity/epic_2/attendance/PresenceStatusActivity.java