resolve conflict

...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/DrawerNavigationInstrumentedTest.java

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

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

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

...droidTest/java/id/ac/ui/cs/myui/NewsHomeActivityTest.java

...t/java/id/ac/ui/cs/myui/NotificationInstrumentedTest.java

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

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

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

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

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

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

app/src/main/AndroidManifest.xml

...rc/main/java/id/ac/ui/cs/myui/activity/AboutActivity.java

...c/main/java/id/ac/ui/cs/myui/activity/DrawerActivity.java

...rc/main/java/id/ac/ui/cs/myui/activity/LoginActivity.java