Merge branch 'main' of https://bitbucket.org/techsagavishal/quikwise

# Conflicts:
#	resources/views/admin/faq/ajax.blade.php
