Merge branch 'develop' of auapgpdgitapp01.genpt.net:Pulse/PulseUI into
pulse-110-111-test
Conflicts:
src/main/java/com/napa/pulse/controller/rest/SessionRestController.java
src/main/java/com/napa/pulse/dao/impl/SessionDAOImpl.java
src/main/java/com/napa/pulse/dao/interfaces/SessionDAO.java
src/main/java/com/napa/pulse/service/impl/SessionServiceImpl.java
src/main/java/com/napa/pulse/service/interfaces/SessionService.java