Merge branch 'feature/optimization' into develop

# Conflicts:
#	src/main/webapp/modules/cont/CON3100/con_contract_cf_query.lview
#	src/main/webapp/modules/prj/PRJ501N/prj_project_maintain.lview