Merge branch 'testing2' into 'master'

src/test/java/CalculatorResourceTest.java

src/test/java/MessageDAOTest.java

src/test/java/MessageResourceTest.java

src/test/java/UserDAOTest.java

src/test/java/UserResourceTest.java