merge conflict files

merge conflict files
merge develop branch changes into current branch
DemographicDaoTest.java and unituser_edit_input.jsp