Merge branch 'testing2' into 'master'

pom.xml

src/main/java/dao/Database.java

src/main/java/resources/CalculatorResource.java

src/main/java/resources/GroupChatResource.java

src/main/java/resources/MessageResource.java

src/main/java/resources/UserResource.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