member view 수정
module 모듈에 flag 추가
board view 수정
	#2 PR 내용 rebase 후 merge 테스트 commit
escape CONFLICT board.view.php
Merge pull request #2 from akasima-pr-sender/develop-pr-mergetest1

* akasima-pr-sender-develop-pr-mergetest1:
  #2 PR 내용 rebase 후 merge 테스트 commit
#2 udadaudada close
#1 PR 머지
Merge pull request #1 from akasima-pr-sender/develop-prtest1 closed

* pr-aaa:
  module 모듈에 flag 추가
  member view 수정
qeasdqweasd
Merge branch 'develop-test1' of https://github.com/akasima-pr-sender/Pull-Request-Test into develop-test1