Merge branch 'develop' into feature/ManageUser
change code -> manage ocp page
insert ResultID & OcpID to db [result_ocp] + add ocp.json & aca.json
add input academic -> view ocp
show ocp -> view manage result
change code -> view manage result
change icon -> view manage ocp
delete table ASM 1 ASM 2 ASM 3
error btn del
Revert "delete table ASM 1 ASM 2 ASM 3"

This reverts commit bbba3cdb0c3c5f8508834e28c1aeb34585c7257a.
Merge branch 'feature/Manage_result' of github.com:yothinix/AdWise into feature/Manage_result
Show status  complete incomplete in progress , Bug delete user popup
Merge branch 'develop' into feature/ManageUser
Merge branch 'feature/View_Result' into develop
Merge branch 'feature/Manage_Occupation_Data' into develop

Conflicts:
	application/config/config.php
Merge branch 'feature/Manage_result' into develop
Merge branch 'feature/ManageUser' into develop
re-Configuration production environment
Merge branch 'release/2.14.3' into develop
Merge branch 'develop' into feature/View_Result