merge
Merge branch 'master' of https://github.com/sdjksdafji/2Young2Simple

Conflicts:
	src/main/java/course/cs5300/project1a/service/implementation/SessionCookieServiceImpl.java

	modified:   src/main/java/course/cs5300/project1a/dao/impl/SessionDAOImpl.java
	modified:   src/main/java/course/cs5300/project1a/service/implementation/SessionCookieServiceImpl.java
Merge branch 'master' of https://github.com/sdjksdafji/2Young2Simple

Conflicts:
	src/main/java/course/cs5300/project1a/service/implementation/SessionCookieServiceImpl.java

	modified:   src/main/java/course/cs5300/project1a/jsfbean/SessionDemoBean.java
	modified:   src/main/java/course/cs5300/project1a/service/SessionCookieService.java
	modified:   src/main/java/course/cs5300/project1a/service/implementation/SessionCookieServiceImpl.java
Merge
Merge branch 'master' of https://github.com/sdjksdafji/2Young2Simple

Conflicts:
	src/main/java/course/cs5300/project1a/jsfbean/SessionDemoBean.java

	modified:   src/main/java/course/cs5300/project1a/dao/impl/SessionDAOImpl.java
	modified:   src/main/java/course/cs5300/project1a/jsfbean/SessionDemoBean.java
	modified:   src/main/java/course/cs5300/project1a/rpc/lib/service/impl/RPCBufferServiceImpl.java
	modified:   src/main/java/course/cs5300/project1a/service/SessionCookieService.java
	modified:   src/main/java/course/cs5300/project1a/service/implementation/SessionCookieServiceImpl.java
sessionDAO getSession