remove function pagelist($aid, $i) in pagination element
Merge branch 'hotfix/hotfix-1.10.1' into develop
[6-4-0] เพิ่ม Role ในส่วนของหน้า manage user
Merge branch 'develop' into feature/ManageUser

Conflicts:
	application/config/config.php
[5-3-0] เปลี่ยนรูปโปรไฟล์ หน้า change password
[11-1-1] Total Question input
+ Using individual page instead Tabbed on Create Assessment
[13-6-0] Trigger for admin to set enable/disable Assessment for user to use Assessment when admin edit assessment complete
[11-4-0] Q+A Generate by AssessmentType
+ Question generate limit by TotalQuestion of Assessment
+ Choice generate by TotalChoice of AssessmentType of Question
+ Generate Dropdown of AssessmentType from DB
Merge branch 'feature/ManageUser' into develop

Conflicts:
	application/config/config.php
	application/views/manage_user.php
+ Fix Date/Time not load
Merge branch 'feature/Profile' into develop
Merge branch 'feature/Manage_Assessment' into develop
Merge branch 'feature/Create_Assessment' into develop

Conflicts:
	application/models/assessment_model.php
Merge branch 'feature/Create_Assessment' into develop

Conflicts:
	application/models/assessment_model.php
Merge branch 'feature/Take_an_Assessment' into develop
Merge branch 'release/release-1.18.2'