Merge remote-tracking branch 'origin/master'

Conflicts:
	plugins/bbpress-quotes/bbpress-quotes.js
	plugins/bbpress-quotes/bbpress-quotes.php
	plugins/bbpress-quotes/readme.txt
	plugins/bbpress/templates/default/css/bbpress-rtl.css
	plugins/bbpress/templates/default/css/bbpress-rtl.min.css
	plugins/bbpress/templates/default/css/bbpress.css
	plugins/bbpress/templates/default/css/bbpress.min.css

	plugins/black-studio-tinymce-widget/black-studio-tinymce-widget-legacy.css

	plugins/black-studio-tinymce-widget/black-studio-tinymce-widget-legacy.js
	plugins/black-studio-tinymce-widget/black-studio-tinymce-widget.css
	plugins/black-studio-tinymce-widget/black-studio-tinymce-widget.js
	plugins/black-studio-tinymce-widget/black-studio-tinymce-widget.php
	plugins/black-studio-tinymce-widget/readme.txt
	plugins/file-away/file-away.php
	plugins/file-away/lib/cls/class.attachaway.php
	plugins/file-away/lib/cls/class.attachaway_column.php
	plugins/file-away/lib/cls/class.fileaframe.php
	plugins/file-away/lib/cls/class.fileaway.php
	plugins/file-away/lib/cls/class.fileaway_admin.php
	plugins/file-away/lib/cls/class.fileaway_attributes.php
	plugins/file-away/lib/cls/class.fileaway_cleanup.php
	plugins/file-away/lib/cls/class.fileaway_definitions.php
	plugins/file-away/lib/cls/class.fileaway_downloader.php
	plugins/file-away/lib/cls/class.fileaway_encrypted.php
	plugins/file-away/lib/cls/class.fileaway_languages.php
	plugins/file-away/lib/cls/class.fileaway_management.php
	plugins/file-away/lib/cls/class.fileaway_modal.php
	plugins/file-away/lib/cls/class.fileaway_notices.php
	plugins/file-away/lib/cls/class.fileaway_prints.php
	plugins/file-away/lib/cls/class.fileaway_tutorials.php
	plugins/file-away/lib/cls/class.fileaway_utility.php
	plugins/file-away/lib/cls/class.fileup.php
	plugins/file-away/lib/cls/class.playaway.php
	plugins/file-away/lib/css/admin.modal.css
	plugins/file-away/lib/css/admin.options-minimal.css
	plugins/file-away/lib/css/admin.options.css
	plugins/file-away/lib/css/controls.svg
	plugins/file-away/lib/css/fileaway-icons.css
	plugins/file-away/lib/css/fileaway-styles.css
	plugins/file-away/lib/css/flashblock.css
	plugins/file-away/lib/css/fonts/fileaplay.svg
	plugins/file-away/lib/css/fonts/fileaway-help.svg
	plugins/file-away/lib/css/fonts/fileaway-search.svg
	plugins/file-away/lib/css/fonts/footable.svg
	plugins/file-away/lib/css/fonts/ssfm-icons.dev.svg
	plugins/file-away/lib/css/fonts/ssfm-icons.svg
	plugins/file-away/lib/css/fonts/yanonekaffeesatz-light-webfont.svg
	plugins/file-away/lib/css/ie7.css
	plugins/file-away/lib/css/ie7.js
	plugins/file-away/lib/css/lte-ie7.js
	plugins/file-away/lib/inc/ext.thumbnails.php
	plugins/file-away/lib/inc/inc.admin.about.php
	plugins/file-away/lib/inc/inc.admin.boxed-in.php
	plugins/file-away/lib/inc/inc.admin.config-instructions.php
	plugins/file-away/lib/inc/inc.admin.custom-color-primary.php
	plugins/file-away/lib/inc/inc.admin.custom-color-secondary.php
	plugins/file-away/lib/inc/inc.admin.custom-table-style.php
	plugins/file-away/lib/inc/inc.admin.tutorials.php
	plugins/file-away/lib/inc/inc.base.php
	plugins/file-away/lib/inc/inc.bulk-action-content.php
	plugins/file-away/lib/inc/inc.bulk-download-content.php
	plugins/file-away/lib/inc/inc.colors.php
	plugins/file-away/lib/inc/inc.declarations.php
	plugins/file-away/lib/inc/inc.deprecated.php
	plugins/file-away/lib/inc/inc.directories-nav.php
	plugins/file-away/lib/inc/inc.directories.php
	plugins/file-away/lib/inc/inc.file-array.php
	plugins/file-away/lib/inc/inc.filters.php
	plugins/file-away/lib/inc/inc.icons.php
	plugins/file-away/lib/inc/inc.manager-access.php
	plugins/file-away/lib/inc/inc.playback.php
	plugins/file-away/lib/inc/inc.precontent.php
	plugins/file-away/lib/inc/inc.prettify.php
	plugins/file-away/lib/inc/inc.styles.php
	plugins/file-away/lib/inc/inc.thead.php
	plugins/file-away/lib/inc/inc.thumbnails-setup.php
	plugins/file-away/lib/inc/inc.thumbnails.php
	plugins/file-away/lib/js/admin.options.js
	plugins/file-away/lib/js/alphanum.js
	plugins/file-away/lib/js/chosen/admin.chosen.css
	plugins/file-away/lib/js/chosen/chosen.css
	plugins/file-away/lib/js/chosen/chosen.js
	plugins/file-away/lib/js/chosen/modal.chosen.js.php
	plugins/file-away/lib/js/clipboard/ZeroClipboard.js
	plugins/file-away/lib/js/codemirror/codemirror.css
	plugins/file-away/lib/js/codemirror/codemirror.js
	plugins/file-away/lib/js/codemirror/css.js
	plugins/file-away/lib/js/filertify.js
	plugins/file-away/lib/js/footable.js
	plugins/file-away/lib/js/management.js
	plugins/file-away/lib/js/modal.js.php
	plugins/file-away/lib/js/soundmanager2.js
	plugins/file-away/lib/lng/file-away-es.po
	plugins/file-away/lib/lng/file-away-es_419.po
	plugins/file-away/lib/lng/file-away-es_AR.po
	plugins/file-away/lib/lng/file-away-es_BO.po
	plugins/file-away/lib/lng/file-away-es_CL.po
	plugins/file-away/lib/lng/file-away-es_CO.po
	plugins/file-away/lib/lng/file-away-es_CR.po
	plugins/file-away/lib/lng/file-away-es_CU.po
	plugins/file-away/lib/lng/file-away-es_DO.po
	plugins/file-away/lib/lng/file-away-es_EC.po
	plugins/file-away/lib/lng/file-away-es_ES.po
	plugins/file-away/lib/lng/file-away-es_GT.po
	plugins/file-away/lib/lng/file-away-es_HN.po
	plugins/file-away/lib/lng/file-away-es_MX.po
	plugins/file-away/lib/lng/file-away-es_NI.po
	plugins/file-away/lib/lng/file-away-es_PA.po
	plugins/file-away/lib/lng/file-away-es_PE.po
	plugins/file-away/lib/lng/file-away-es_PH.po
	plugins/file-away/lib/lng/file-away-es_PR.po
	plugins/file-away/lib/lng/file-away-es_PY.po
	plugins/file-away/lib/lng/file-away-es_SV.po
	plugins/file-away/lib/lng/file-away-es_US.po
	plugins/file-away/lib/lng/file-away-es_UY.po
	plugins/file-away/lib/lng/file-away-es_VE.po
	plugins/file-away/lib/lng/file-away-it.po
	plugins/file-away/lib/lng/file-away-it_CH.po
	plugins/file-away/lib/lng/file-away-it_IT.po
	plugins/file-away/lib/lng/file-away-it_SM.po
	plugins/file-away/readme.txt
	plugins/file-away/templates/file-away-iframe-template.php
	plugins/file-away/uninstall.php
	plugins/foobox-image-lightbox/css/font/foobox.svg
	plugins/foobox-image-lightbox/css/foobox.free.min.css
	plugins/foobox-image-lightbox/foobox-free.php

	plugins/foobox-image-lightbox/includes/class-foogallery-foobox-free-extension.php
	plugins/foobox-image-lightbox/includes/class-script-generator.php
	plugins/foobox-image-lightbox/includes/class-settings.php
	plugins/foobox-image-lightbox/includes/foopluginbase/.gitignore
	plugins/foobox-image-lightbox/includes/foopluginbase/README.md
	plugins/foobox-image-lightbox/includes/foopluginbase/bootstrapper.php
	plugins/foobox-image-lightbox/includes/foopluginbase/changelog.txt

	plugins/foobox-image-lightbox/includes/foopluginbase/classes/class-foo-plugin-base.php

	plugins/foobox-image-lightbox/includes/foopluginbase/classes/class-foo-plugin-options.php

	plugins/foobox-image-lightbox/includes/foopluginbase/classes/class-foo-plugin-settings.php

	plugins/foobox-image-lightbox/includes/foopluginbase/classes/class-foo-plugin-textdomain.php

	plugins/foobox-image-lightbox/includes/foopluginbase/functions/arrays.php

	plugins/foobox-image-lightbox/includes/foopluginbase/functions/general.php

	plugins/foobox-image-lightbox/includes/foopluginbase/functions/screen.php

	plugins/foobox-image-lightbox/includes/foopluginbase/functions/strings.php

	plugins/foobox-image-lightbox/includes/foopluginbase/js/admin-settings.js
	plugins/foobox-image-lightbox/includes/foopluginbase/views/settings.php
	plugins/foobox-image-lightbox/includes/recommend.php
	plugins/foobox-image-lightbox/includes/settings-sidebar.php
	plugins/foobox-image-lightbox/install.txt
	plugins/foobox-image-lightbox/license.txt
	plugins/foobox-image-lightbox/readme.txt
	plugins/gd-bbpress-attachments/code/admin.php
	plugins/gd-bbpress-attachments/code/attachments/admin.php
	plugins/gd-bbpress-attachments/code/attachments/class.php
	plugins/gd-bbpress-attachments/code/attachments/front.php
	plugins/gd-bbpress-attachments/code/attachments/public.php
	plugins/gd-bbpress-attachments/code/shared.php
	plugins/gd-bbpress-attachments/css/gd-bbpress-attachments.css
	plugins/gd-bbpress-attachments/css/gd-bbpress-attachments_admin.css
	plugins/gd-bbpress-attachments/forms/tabs/d4p.php
	plugins/gd-bbpress-attachments/forms/tabs/toolbox.php
	plugins/gd-bbpress-attachments/gd-bbpress-attachments.php
	plugins/gd-bbpress-attachments/js/gd-bbpress-attachments.js
	plugins/gd-bbpress-attachments/license.txt
	plugins/gd-bbpress-attachments/readme.txt
	plugins/ifeature-slider/css/admin.css
	plugins/ifeature-slider/css/bootstrap.css
	plugins/ifeature-slider/css/cyberchimps-responsive.min.css
	plugins/ifeature-slider/css/if-slider.css
	plugins/ifeature-slider/css/options-style.css
	plugins/ifeature-slider/fonts/cyberchimps.svg
	plugins/ifeature-slider/fonts/glyphicons-halflings-regular.svg
	plugins/ifeature-slider/fonts/monosocialiconsfont-1.10.svg
	plugins/ifeature-slider/ifeature-front-slider.php
	plugins/ifeature-slider/ifeatureslider.php
	plugins/ifeature-slider/js/admin.js
	plugins/ifeature-slider/js/if-slider.js
	plugins/ifeature-slider/js/mce_btn.js
	plugins/ifeature-slider/readme.txt
	plugins/iframe/iframe.php
	plugins/iframe/readme.txt
	plugins/shortcodes-ultimate/assets/css/animate.css
	plugins/shortcodes-ultimate/assets/css/box-shortcodes.css
	plugins/shortcodes-ultimate/assets/css/cheatsheet.css
	plugins/shortcodes-ultimate/assets/css/content-shortcodes.css
	plugins/shortcodes-ultimate/assets/css/galleries-shortcodes.css
	plugins/shortcodes-ultimate/assets/css/generator.css
	plugins/shortcodes-ultimate/assets/css/magnific-popup.css
	plugins/shortcodes-ultimate/assets/css/media-shortcodes.css
	plugins/shortcodes-ultimate/assets/css/options-page.css
	plugins/shortcodes-ultimate/assets/css/other-shortcodes.css
	plugins/shortcodes-ultimate/assets/css/owl-carousel-transitions.css
	plugins/shortcodes-ultimate/assets/css/owl-carousel.css
	plugins/shortcodes-ultimate/assets/css/players-shortcodes.css
	plugins/shortcodes-ultimate/assets/css/qtip.css
	plugins/shortcodes-ultimate/assets/css/simpleslider.css
	plugins/shortcodes-ultimate/assets/css/sunrise.css
	plugins/shortcodes-ultimate/assets/css/tinymce.css
	plugins/shortcodes-ultimate/assets/css/vote.css
	plugins/shortcodes-ultimate/assets/js/chart.js
	plugins/shortcodes-ultimate/assets/js/form.js
	plugins/shortcodes-ultimate/assets/js/galleries-shortcodes.js
	plugins/shortcodes-ultimate/assets/js/generator.js
	plugins/shortcodes-ultimate/assets/js/inview.js
	plugins/shortcodes-ultimate/assets/js/jplayer.js
	plugins/shortcodes-ultimate/assets/js/jsrender.js
	plugins/shortcodes-ultimate/assets/js/magnific-popup.js
	plugins/shortcodes-ultimate/assets/js/options-page.js
	plugins/shortcodes-ultimate/assets/js/other-shortcodes.js
	plugins/shortcodes-ultimate/assets/js/players-shortcodes.js
	plugins/shortcodes-ultimate/assets/js/qtip.js
	plugins/shortcodes-ultimate/assets/js/simpleslider.js
	plugins/shortcodes-ultimate/assets/js/sunrise.js
	plugins/shortcodes-ultimate/assets/js/tinymce.js
	plugins/shortcodes-ultimate/assets/js/vote.js
	plugins/shortcodes-ultimate/inc/core/admin-views.php
	plugins/shortcodes-ultimate/inc/core/assets.php
	plugins/shortcodes-ultimate/inc/core/counters.php
	plugins/shortcodes-ultimate/inc/core/data.php
	plugins/shortcodes-ultimate/inc/core/generator-views.php
	plugins/shortcodes-ultimate/inc/core/generator.php
	plugins/shortcodes-ultimate/inc/core/load.php
	plugins/shortcodes-ultimate/inc/core/requirements.php
	plugins/shortcodes-ultimate/inc/core/shortcodes.php
	plugins/shortcodes-ultimate/inc/core/tools.php
	plugins/shortcodes-ultimate/inc/core/vote.php
	plugins/shortcodes-ultimate/inc/core/widget.php
	plugins/shortcodes-ultimate/inc/examples/animations.example
	plugins/shortcodes-ultimate/inc/examples/buttons.example
	plugins/shortcodes-ultimate/inc/examples/columns.example
	plugins/shortcodes-ultimate/inc/examples/media.example
	plugins/shortcodes-ultimate/inc/examples/nested.example
	plugins/shortcodes-ultimate/inc/examples/posts.example
	plugins/shortcodes-ultimate/inc/examples/spoilers.example
	plugins/shortcodes-ultimate/inc/examples/tabs.example
	plugins/shortcodes-ultimate/inc/vendor/sunrise.php
	plugins/shortcodes-ultimate/languages/su-el_GR.po
	plugins/shortcodes-ultimate/languages/su-fr_FR.po
	plugins/shortcodes-ultimate/languages/su-nl_NL.po
	plugins/shortcodes-ultimate/languages/su-vi.po
	plugins/shortcodes-ultimate/readme.txt
	plugins/shortcodes-ultimate/shortcodes-ultimate.php
	plugins/shortcodes-ultimate/templates/default-loop.php
	plugins/shortcodes-ultimate/templates/list-loop.php
	plugins/shortcodes-ultimate/templates/single-post.php
	plugins/shortcodes-ultimate/templates/teaser-loop.php
	plugins/smart-forms/css/formBuilder/custom.css
	plugins/smart-forms/css/grid_chart/jquery.jqplot.css
	plugins/smart-forms/css/grid_chart/ui.jqgrid.css
	plugins/smart-forms/integration/smart-donations-integration-ajax.php
	plugins/smart-forms/integration/smart-donations-integration-ipn.php

	plugins/smart-forms/integration/smart-donations-integration-license-helper.php
	plugins/smart-forms/js/conditional_manager/conditional-handler-steps.js
	plugins/smart-forms/js/conditional_manager/conditional-handlers.js
	plugins/smart-forms/js/conditional_manager/conditional-logic-manager.js
	plugins/smart-forms/js/editors/style_editor/element-styler.js
	plugins/smart-forms/js/editors/style_editor/style-editor.js
	plugins/smart-forms/js/editors/style_editor/style-properties.js
	plugins/smart-forms/js/editors/style_editor/styler-set.js
	plugins/smart-forms/js/formBuilder/dragManager/dragitembehaviors.js
	plugins/smart-forms/js/formBuilder/dragManager/dragmanager.js
	plugins/smart-forms/js/formBuilder/formbuilder.js
	plugins/smart-forms/js/grid_chart/excanvas.min.js
	plugins/smart-forms/js/grid_chart/grid.locale-en.js
	plugins/smart-forms/js/grid_chart/jqplot.canvasAxisTickRenderer.min.js
	plugins/smart-forms/js/grid_chart/jqplot.cursor.min.js
	plugins/smart-forms/js/grid_chart/jqplot.dateAxisRenderer.min.js
	plugins/smart-forms/js/grid_chart/jqplot.highlighter.js
	plugins/smart-forms/js/grid_chart/jqplot.pointLabels.min.js
	plugins/smart-forms/js/grid_chart/jquery.jqplot.min.js
	plugins/smart-forms/js/integration/smart-donations-integration.js
	plugins/smart-forms/js/subscriber_interfaces/ismart-forms-add-new.js
	plugins/smart-forms/js/utilities/jsColor/jscolor.js
	plugins/smart-forms/main_screens/smart-forms-tutorials.php
	plugins/smart-forms/php_classes/file_upload/physical_file_uploader.php
	plugins/smart-forms/php_classes/save/php_entry_saver_base.php
	plugins/smart-forms/pr/css/main-style.css

	plugins/smart-forms/pr/js/form_element_extensions/form-element-extensions.js
	plugins/smart-forms/pr/js/main_screens/add-new-extensions.js
	plugins/smart-forms/pr/smart-forms-pr-config.php
	plugins/smart-forms/pr/smart-forms-pr.php
	plugins/smart-forms/readme.txt
	plugins/smart-forms/smart-forms-exporter.php
	plugins/smart-forms/smart_forms_uploader.php
	plugins/smart-forms/string_renderer/rednao_donation_recurrence.php
	plugins/smart-forms/translations/form-elements-translation.php
	plugins/smart-forms/translations/smart-forms-add-new-translation.php
Merge remote-tracking branch 'origin/master'