64b6b2a4ef
Conflicts: src/test/java/se/su/dsv/scipro/configuration/TestDeployConfiguration.java src/test/java/se/su/dsv/scipro/dao/jpa/TestActivityPlanDaoJPA.java src/test/java/se/su/dsv/scipro/dao/jpa/TestBoardMessageDaoJPA.java src/test/java/se/su/dsv/scipro/dao/jpa/TestCategoryDaoJPA.java src/test/java/se/su/dsv/scipro/dao/jpa/TestCheckListTemplateDao.java src/test/java/se/su/dsv/scipro/dao/jpa/TestCheckPlagiarismEventDaoJPA.java src/test/java/se/su/dsv/scipro/dao/jpa/TestCommentThreadDaoJPA.java src/test/java/se/su/dsv/scipro/dao/jpa/TestFinalSeminarDaoJPA.java src/test/java/se/su/dsv/scipro/dao/jpa/TestMessageBoardDaoJPA.java src/test/java/se/su/dsv/scipro/dao/jpa/TestPeerReviewDaoJPA.java src/test/java/se/su/dsv/scipro/dao/jpa/TestPrivateMessageDaoJPA.java src/test/java/se/su/dsv/scipro/dao/jpa/TestProjectDaoJPA.java src/test/java/se/su/dsv/scipro/dao/jpa/TestProjectPartnerDaoJPA.java src/test/java/se/su/dsv/scipro/dao/jpa/TestRatableDaoJPA.java src/test/java/se/su/dsv/scipro/dao/jpa/TestRecipientDaoJPA.java src/test/java/se/su/dsv/scipro/dao/jpa/TestResourceDaoJPA.java src/test/java/se/su/dsv/scipro/dao/jpa/TestRoleDaoJPA.java src/test/java/se/su/dsv/scipro/dao/jpa/TestScheduleTemplateDaoJPA.java src/test/java/se/su/dsv/scipro/dao/jpa/TestStringResourceDaoJPA.java src/test/java/se/su/dsv/scipro/dao/jpa/TestTagDaoJPA.java src/test/java/se/su/dsv/scipro/dao/jpa/TestUserDaoJPA.java src/test/java/se/su/dsv/scipro/dao/jpa/TestWebNotificationDaoJPA.java src/test/java/se/su/dsv/scipro/data/dao/jpa/TestQuery.java src/test/java/se/su/dsv/scipro/data/dao/jpa/TestQuerySet.java src/test/java/se/su/dsv/scipro/dataproviders/TestSortableDataProvider.java src/test/java/se/su/dsv/scipro/match/TestGreedyMatchingAlgorithm.java src/test/java/se/su/dsv/scipro/match/TestMatcher.java src/test/java/se/su/dsv/scipro/match/dao/TestApplicationPeriodDao.java src/test/java/se/su/dsv/scipro/match/dao/TestAuthorDao.java src/test/java/se/su/dsv/scipro/match/dao/TestExemptionDao.java src/test/java/se/su/dsv/scipro/match/dao/TestKeywordDao.java src/test/java/se/su/dsv/scipro/match/dao/TestMatchDao.java src/test/java/se/su/dsv/scipro/match/dao/TestProjectIdeaDao.java src/test/java/se/su/dsv/scipro/match/dao/TestSupervisorDao.java src/test/java/se/su/dsv/scipro/match/dataobject/TestProjectIdea.java