Merge remote branch 'upstream/master'

Conflicts:
	application/controllers/admin.php
	application/models/course_model.php
Frontend
Merge branch 'master' of https://github.com/kamal3987/akshar_design_solution

Conflicts:
	application/controllers/admin.php