manifest 정리
Merge branch 'feature/man4' of https://github.com/Ganco/KNU_Market into feature/man2
merge 정리
메인act에서 뒤로가기 종료방지, 알람서비스 수정중, 로그인act 디자인 개선
부팅시 서비스시작
키워드 설정창에 preference,switch기능추가, alramService 수정중
Merge branch 'feature/man2' of https://github.com/Ganco/KNU_Market into feature/man4

Conflicts:
	app/src/main/java/com/harold/knumarket/Activity/ConfigActivity.java
	app/src/main/java/com/harold/knumarket/Activity/MainActivity.java
	app/src/main/java/com/harold/knumarket/fragment/Fragment_section1.java
	app/src/main/res/layout/activity_login.xml