Conflicts merged , removed unwanted symbols from integrationServerAdmin.jsp and added new message in message.properties
DIM-3 change hibernate map files dhis to dim