h
Merge branch 'master' of github.com:krestine/randomSelectProject

Conflicts:
	ZEeMakePrice/target/m2e-wtp/web-resources/META-INF/maven/ezo.mp/z/pom.properties
j
Merge branch 'master' of github.com:krestine/randomSelectProject

Conflicts:
	RandomSelectProject/src/main/webapp/WEB-INF/views/randomSelect/main.jsp
j
Merge branch 'master' of github.com:krestine/randomSelectProject
메일발송
Merge branch 'master' of github.com:krestine/randomSelectProject

Conflicts:
	RandomSelectProject/pom.xml
	RandomSelectProject/src/main/java/com/project/controller/MemberController.java
	RandomSelectProject/src/main/java/com/project/domain/MemberDTO.java
	RandomSelectProject/src/main/webapp/WEB-INF/spring/appServlet/servlet-context.xml
	RandomSelectProject/src/main/webapp/WEB-INF/views/member/findId.jsp
	RandomSelectProject/src/main/webapp/WEB-INF/views/member/findPassword.jsp
	RandomSelectProject/src/main/webapp/WEB-INF/views/member/findPasswordOk.jsp
	RandomSelectProject/src/main/webapp/WEB-INF/views/member/loginOk.jsp
	RandomSelectProject/src/main/webapp/WEB-INF/views/member/register.jsp
	RandomSelectProject/src/main/webapp/WEB-INF/views/member/registerOk.jsp
	RandomSelectProject/src/main/webapp/WEB-INF/views/mypage/myInfo.jsp