Instala plugins de importação e fomidable pro
Merge branch 'master' of https://github.com/rafapires/adfap

Conflicts:
	wp-content/plugins/formidable/classes/controllers/FrmAppController.php
	wp-content/plugins/formidable/classes/controllers/FrmEntriesController.php
	wp-content/plugins/formidable/classes/controllers/FrmFieldsController.php
	wp-content/plugins/formidable/classes/controllers/FrmFormsController.php
	wp-content/plugins/formidable/classes/controllers/FrmSettingsController.php
	wp-content/plugins/formidable/classes/controllers/FrmStatisticsController.php
	wp-content/plugins/formidable/classes/helpers/FrmAppHelper.php
	wp-content/plugins/formidable/classes/helpers/FrmEntriesHelper.php
	wp-content/plugins/formidable/classes/helpers/FrmFieldsHelper.php
	wp-content/plugins/formidable/classes/helpers/FrmFormsHelper.php
	wp-content/plugins/formidable/classes/helpers/FrmListHelper.php
	wp-content/plugins/formidable/classes/models/FrmDb.php
	wp-content/plugins/formidable/classes/models/FrmEntry.php
	wp-content/plugins/formidable/classes/models/FrmEntryMeta.php
	wp-content/plugins/formidable/classes/models/FrmField.php
	wp-content/plugins/formidable/classes/models/FrmForm.php
	wp-content/plugins/formidable/classes/models/FrmNotification.php
	wp-content/plugins/formidable/classes/models/FrmSettings.php
	wp-content/plugins/formidable/classes/views/frm-entries/direct.php
	wp-content/plugins/formidable/classes/views/frm-entries/errors.php
	wp-content/plugins/formidable/classes/views/frm-entries/form.php
	wp-content/plugins/formidable/classes/views/frm-entries/frm-entry.php
	wp-content/plugins/formidable/classes/views/frm-entries/list.php
	wp-content/plugins/formidable/classes/views/frm-entries/new.php
	wp-content/plugins/formidable/classes/views/frm-entries/no_entries.php
	wp-content/plugins/formidable/classes/views/frm-fields/import_choices.php
	wp-content/plugins/formidable/classes/views/frm-fields/input.php
	wp-content/plugins/formidable/classes/views/frm-fields/radio.php
	wp-content/plugins/formidable/classes/views/frm-fields/single-option.php
	wp-content/plugins/formidable/classes/views/frm-forms/add_field.php
	wp-content/plugins/formidable/classes/views/frm-forms/add_field_links.php
	wp-content/plugins/formidable/classes/views/frm-forms/default-templates.php
	wp-content/plugins/formidable/classes/views/frm-forms/edit.php
	wp-content/plugins/formidable/classes/views/frm-forms/form.php
	wp-content/plugins/formidable/classes/views/frm-forms/insert_form_popup.php
	wp-content/plugins/formidable/classes/views/frm-forms/list.php
	wp-content/plugins/formidable/classes/views/frm-forms/mb_html_tab.php
	wp-content/plugins/formidable/classes/views/frm-forms/mb_insert_fields.php
	wp-content/plugins/formidable/classes/views/frm-forms/new-selection.php
	wp-content/plugins/formidable/classes/views/frm-forms/new.php
	wp-content/plugins/formidable/classes/views/frm-forms/notification.php
	wp-content/plugins/formidable/classes/views/frm-forms/settings.php
	wp-content/plugins/formidable/classes/views/frm-forms/sidebar-settings.php
	wp-content/plugins/formidable/classes/views/frm-settings/form.php
	wp-content/plugins/formidable/classes/views/frm-statistics/list.php
	wp-content/plugins/formidable/classes/views/frm-statistics/list_displays.php
	wp-content/plugins/formidable/classes/views/shared/errors.php
	wp-content/plugins/formidable/classes/views/shared/form-nav.php
	wp-content/plugins/formidable/classes/views/shared/nav.php
	wp-content/plugins/formidable/classes/views/shared/update_message.php
	wp-content/plugins/formidable/classes/widgets/FrmShowForm.php
	wp-content/plugins/formidable/css/frm_admin.css
	wp-content/plugins/formidable/css/frm_display.css
	wp-content/plugins/formidable/formidable.php
	wp-content/plugins/formidable/images/form_16.png
	wp-content/plugins/formidable/images/tooltip.png
	wp-content/plugins/formidable/images/trash.png
	wp-content/plugins/formidable/js/formidable.js
	wp-content/plugins/formidable/js/formidable.min.js
	wp-content/plugins/formidable/js/formidable_admin.js
	wp-content/plugins/formidable/js/jquery/jquery-ui-themepicker.js
	wp-content/plugins/formidable/js/jquery/jquery.editinplace.js
	wp-content/plugins/formidable/js/jquery/jquery.editinplace.packed.js
	wp-content/plugins/formidable/languages/formidable-de_DE.mo
	wp-content/plugins/formidable/languages/formidable-de_DE.po
	wp-content/plugins/formidable/languages/formidable-en_US.po
	wp-content/plugins/formidable/languages/formidable-nl_NL.mo
	wp-content/plugins/formidable/languages/formidable-nl_NL.po
	wp-content/plugins/formidable/languages/formidable-pl_PL.mo
	wp-content/plugins/formidable/languages/formidable-pl_PL.po
	wp-content/plugins/formidable/languages/formidable-pt_BR.mo
	wp-content/plugins/formidable/languages/formidable-pt_BR.po
	wp-content/plugins/formidable/pro/classes/controllers/FrmProAppController.php
	wp-content/plugins/formidable/pro/classes/controllers/FrmProCopiesController.php
	wp-content/plugins/formidable/pro/classes/controllers/FrmProDisplaysController.php
	wp-content/plugins/formidable/pro/classes/controllers/FrmProEntriesController.php
	wp-content/plugins/formidable/pro/classes/controllers/FrmProFieldsController.php
	wp-content/plugins/formidable/pro/classes/controllers/FrmProFormsController.php
	wp-content/plugins/formidable/pro/classes/controllers/FrmProSettingsController.php
	wp-content/plugins/formidable/pro/classes/controllers/FrmProStatisticsController.php
	wp-content/plugins/formidable/pro/classes/helpers/FrmProAppHelper.php
	wp-content/plugins/formidable/pro/classes/helpers/FrmProDisplaysHelper.php
	wp-content/plugins/formidable/pro/classes/helpers/FrmProEntriesHelper.php
	wp-content/plugins/formidable/pro/classes/helpers/FrmProEntryMetaHelper.php
	wp-content/plugins/formidable/pro/classes/helpers/FrmProFieldsHelper.php
	wp-content/plugins/formidable/pro/classes/helpers/FrmProFormsHelper.php
	wp-content/plugins/formidable/pro/classes/helpers/FrmProListHelper.php
	wp-content/plugins/formidable/pro/classes/models/FrmProCopy.php
	wp-content/plugins/formidable/pro/classes/models/FrmProDb.php
	wp-content/plugins/formidable/pro/classes/models/FrmProDisplay.php
	wp-content/plugins/formidable/pro/classes/models/FrmProEntry.php
	wp-content/plugins/formidable/pro/classes/models/FrmProEntryMeta.php
	wp-content/plugins/formidable/pro/classes/models/FrmProField.php
	wp-content/plugins/formidable/pro/classes/models/FrmProForm.php
	wp-content/plugins/formidable/pro/classes/models/FrmProNotification.php
	wp-content/plugins/formidable/pro/classes/models/FrmProSettings.php
	wp-content/plugins/formidable/pro/classes/views/displays/mb_advanced.php
	wp-content/plugins/formidable/pro/classes/views/displays/mb_dyncontent.php
	wp-content/plugins/formidable/pro/classes/views/displays/mb_excerpt.php
	wp-content/plugins/formidable/pro/classes/views/displays/mb_form_disp_type.php
	wp-content/plugins/formidable/pro/classes/views/displays/pagination.php
	wp-content/plugins/formidable/pro/classes/views/displays/submitbox_actions.php
	wp-content/plugins/formidable/pro/classes/views/displays/where_options.php
	wp-content/plugins/formidable/pro/classes/views/displays/where_row.php
	wp-content/plugins/formidable/pro/classes/views/frmpro-entries/csv.php
	wp-content/plugins/formidable/pro/classes/views/frmpro-entries/edit-front.php
	wp-content/plugins/formidable/pro/classes/views/frmpro-entries/edit.php
	wp-content/plugins/formidable/pro/classes/views/frmpro-entries/footer_js.php
	wp-content/plugins/formidable/pro/classes/views/frmpro-entries/google_table.php
	wp-content/plugins/formidable/pro/classes/views/frmpro-entries/list.php
	wp-content/plugins/formidable/pro/classes/views/frmpro-entries/loading.php
	wp-content/plugins/formidable/pro/classes/views/frmpro-entries/new-selection.php
	wp-content/plugins/formidable/pro/classes/views/frmpro-entries/new.php
	wp-content/plugins/formidable/pro/classes/views/frmpro-entries/search.php
	wp-content/plugins/formidable/pro/classes/views/frmpro-entries/show.php
	wp-content/plugins/formidable/pro/classes/views/frmpro-entries/sidebar-edit.php
	wp-content/plugins/formidable/pro/classes/views/frmpro-entries/sidebar-new.php
	wp-content/plugins/formidable/pro/classes/views/frmpro-entries/sidebar-show.php
	wp-content/plugins/formidable/pro/classes/views/frmpro-entries/table.php
	wp-content/plugins/formidable/pro/classes/views/frmpro-fields/10radio.php
	wp-content/plugins/formidable/pro/classes/views/frmpro-fields/_logic_row.php
	wp-content/plugins/formidable/pro/classes/views/frmpro-fields/data-options.php
	wp-content/plugins/formidable/pro/classes/views/frmpro-fields/dynamic-options.php
	wp-content/plugins/formidable/pro/classes/views/frmpro-fields/field-selection.php
	wp-content/plugins/formidable/pro/classes/views/frmpro-fields/field-values.php
	wp-content/plugins/formidable/pro/classes/views/frmpro-fields/form-fields.php
	wp-content/plugins/formidable/pro/classes/views/frmpro-fields/options-form.php
	wp-content/plugins/formidable/pro/classes/views/frmpro-fields/show-other.php
	wp-content/plugins/formidable/pro/classes/views/frmpro-fields/show.php
	wp-content/plugins/formidable/pro/classes/views/frmpro-fields/star_disabled.php
	wp-content/plugins/formidable/pro/classes/views/frmpro-forms/_custom_field_row.php
	wp-content/plugins/formidable/pro/classes/views/frmpro-forms/_logic_row.php
	wp-content/plugins/formidable/pro/classes/views/frmpro-forms/_post_field_options.php
	wp-content/plugins/formidable/pro/classes/views/frmpro-forms/_post_taxonomy_row.php
	wp-content/plugins/formidable/pro/classes/views/frmpro-forms/add_form_options.php
	wp-content/plugins/formidable/pro/classes/views/frmpro-forms/instructions.php
	wp-content/plugins/formidable/pro/classes/views/frmpro-forms/notifications.php
	wp-content/plugins/formidable/pro/classes/views/frmpro-forms/post_options.php
	wp-content/plugins/formidable/pro/classes/views/frmpro-statistics/show.php
	wp-content/plugins/formidable/pro/classes/views/settings/form.php
	wp-content/plugins/formidable/pro/classes/views/settings/formroller.php
	wp-content/plugins/formidable/pro/classes/views/shared/mb_adv_info.php
	wp-content/plugins/formidable/pro/classes/views/shared/xml.php
	wp-content/plugins/formidable/pro/classes/widgets/FrmListEntries.php
	wp-content/plugins/formidable/pro/css/custom_theme.css.php
	wp-content/plugins/formidable/pro/formidable-pro.php
	wp-content/plugins/formidable/pro/js/jquery.rating.min.js
	wp-content/plugins/formidable/readme.txt
	wp-content/plugins/formidable/screenshot-1.png
	wp-content/plugins/formidable/screenshot-2.png
	wp-content/plugins/formidable/screenshot-3.png