Moved the html on get_user_modal_via_ajax() to helpers file
Merge remote-tracking branch 'origin/force-enable-authy' into force-enable-authy

Conflicts:
	authy.php