Revert shop popup
Faq and Faq Section admin
Merge remote-tracking branch 'origin/master'

Conflicts:
	themes/luckybuys/views/site/_shopnow_popup.php