complete translation merge concordion test case for auto and refactoring
written concordion test cases for merge type IMPORT
refactro merge type IMPORT
add merge service and test for case when server has null target
refactor TranslationServiceImpl to use merge service
promote concordion dep to server and tweek surefire to run junit and testng together
fix issues
clean up
rhbz953734 - fix issue save Approved will trigger another implicit save as Translated
rhbz953734 - fix style in translation history table
rhbz953734 - fix issue: jsp can't find setter
fix rebase error
fix rebase error
disable junit test run