Merge branch 'feature/man2' of https://github.com/Ganco/KNU_Market into feature/man4

Conflicts:
	app/src/main/java/com/harold/knumarket/AlarmService.java
	app/src/main/java/com/harold/knumarket/User_Info.java
카테고리 아이콘 추가
카테고리 버튼 스타일 적용
폰트 추가
Merge branch 'feature/man2' of https://github.com/Ganco/KNU_Market into feature/man4

Conflicts:
	app/src/main/java/com/harold/knumarket/Activity/MyPageActivity.java
	app/src/main/java/com/harold/knumarket/User_Info.java
	app/src/main/res/layout/activity_mypage.xml
no message
찜act 버튼링크 지원