Merge branch 'testing2' into 'master'

src/main/java/dao/UserDAO.java

src/main/webapp/js/index.js

src/test/java/MessageDAOTest.java

src/test/java/MessageResourceTest.java

src/test/java/UserDAOTest.java

src/test/java/UserResourceTest.java