#22 Login Cookie complete
#76 #27 #21 로그인 페이지와 가입 페이지를 하나의 페이지로 통합
Merge remote-tracking branch 'origin/develop' into feature/dao

Conflicts:
	rollingPuppy/src/main/java/com/puppy/controller/JoinController.java
	rollingPuppy/src/main/java/com/puppy/controller/LoginController.java
	rollingPuppy/src/main/webapp/WEB-INF/web.xml
	rollingPuppy/src/main/webapp/index.jsp