commit
Merge branch 'master' of https://github.com/hukla/gaenari
commit
Conflicts:
	src/conf/brdReq.xml
	src/model/dto/BrdReqDTO.java
commit_고친거