병합, 내글보기, 내찜보기, 찜하기 기능
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