머징작업 완료
Merge branch 'master' of
https://github.com/nocode2k/spring3-mvc-example.git

Conflicts:
	src/main/java/com/wmp/board/controller/BoardController.java
	src/main/java/com/wmp/user/controller/UsersController.java
머징작업 완료
로그인시 실패하면 알림 - 조남권 
로그인 후 게시판 첫 페이지로 이동 - 조남권
form command 정리함
Merge branch 'master' of
https://github.com/nocode2k/spring3-mvc-example.git

Conflicts:
	src/main/java/com/wmp/board/controller/BoardController.java
예외처리 부분이 롤백되어 있어서 다시 추가함
Validation 체크를 글쓰기와 Comment에 일부 추가함
Merge branch 'master' of
https://github.com/nocode2k/spring3-mvc-example.git

Conflicts:
	src/main/webapp/WEB-INF/views/board/view.jsp
Merge branch 'master' of
https://github.com/nocode2k/spring3-mvc-example.git

충돌 머징
충돌 머징
Merge branch 'master' of https://github.com/nocode2k/spring3-mvc-example.git
어노테이션 유효성 검사 추가(로그인, 비밀번호 변경, 내정보수정)
Merge branch 'master' of
https://github.com/nocode2k/spring3-mvc-example.git

Conflicts:
	src/main/java/com/wmp/user/model/User.java
	src/main/webapp/WEB-INF/views/users/changePasswd.jsp
	src/main/webapp/WEB-INF/views/users/editAccount.jsp
	src/main/webapp/WEB-INF/views/users/login.jsp
머징작업 완료
Security 적용
Merge branch 'master' of
https://github.com/nocode2k/spring3-mvc-example.git

Conflicts:
	src/main/java/com/wmp/user/dao/UserDao.java
	src/main/java/com/wmp/user/service/UserService.java
	src/main/resources/mybatis/mysql/userMapper.xml