Merge remote branch 'upstream/master'

Conflicts:
	application/controllers/admin.php
Merge remote branch 'upstream/master'

Conflicts:
	application/controllers/admin.php
frontend_pages
frontend_event
Merge branch 'master' of https://github.com/kamal3987/akshar_design_solution

Conflicts:
	application/views/frontend/about_us.php
	application/views/frontend/contact_us.php
	application/views/frontend/course_details.php
	application/views/frontend/courses.php
	application/views/frontend/photo_gallery.php