Merge branch 'master' of https://github.com/izmayoub/OurRand

Conflicts:
plugins/ayb_members/main.php
plugins/newsletter/admin.js
plugins/newsletter/editor.css
plugins/newsletter/emails/emails.php
plugins/newsletter/emails/languages/en_US.php
plugins/newsletter/emails/theme.php
plugins/newsletter/emails/themes/default/social-options.php
plugins/newsletter/emails/themes/default/social.php
plugins/newsletter/emails/themes/default/theme-options.php
plugins/newsletter/emails/themes/linear/theme-options.php
plugins/newsletter/emails/themes/linear/theme.php
plugins/newsletter/emails/themes/pint/theme-options.php
plugins/newsletter/emails/themes/theme-1/theme-options.php
plugins/newsletter/emails/themes/theme-1/theme.php
plugins/newsletter/emails/themes/theme-3/theme-options.php
plugins/newsletter/emails/themes/vimeo-like/theme-options.php
plugins/newsletter/feed/feed.php
plugins/newsletter/feed/languages/en_US.php
plugins/newsletter/feed/preview.php
plugins/newsletter/feed/themes/default/theme-options.php
plugins/newsletter/header.php
plugins/newsletter/includes/controls.php
plugins/newsletter/includes/logger.php
plugins/newsletter/includes/store.php
plugins/newsletter/includes/themes.php
plugins/newsletter/main/diagnostic.php
plugins/newsletter/main/index.php
plugins/newsletter/main/main.php
plugins/newsletter/statistics/index.php
plugins/newsletter/statistics/open.php
plugins/newsletter/statistics/view.php
plugins/newsletter/subscription/forms.php
plugins/newsletter/subscription/languages/de_DE.php
plugins/newsletter/subscription/languages/en_US.php
plugins/newsletter/subscription/languages/it_IT.php
plugins/newsletter/subscription/languages/nl_NL.php
plugins/newsletter/subscription/languages/pl_PL.php
plugins/newsletter/subscription/languages/profile-en_US.php
plugins/newsletter/subscription/languages/profile-it_IT.php
plugins/newsletter/subscription/languages/pt_BR.php
plugins/newsletter/subscription/languages/ru_RU.php
plugins/newsletter/subscription/menu.inc.php
plugins/newsletter/subscription/profile.php
plugins/newsletter/subscription/styles/gray.css
plugins/newsletter/subscription/styles/neutral.css
plugins/newsletter/subscription/styles/white.css
plugins/newsletter/subscription/styles/widget-neutral.css
plugins/newsletter/subscription/subscription.php
plugins/newsletter/tiny_mce/license.txt
plugins/newsletter/tiny_mce/plugins/fullscreen/editor_plugin_src.js
plugins/newsletter/tiny_mce/plugins/fullscreen/fullscreen.htm
plugins/newsletter/tiny_mce/plugins/inlinepopups/editor_plugin_src.js
plugins/newsletter/tiny_mce/plugins/inlinepopups/template.htm
plugins/newsletter/tiny_mce/plugins/legacyoutput/editor_plugin_src.js
plugins/newsletter/tiny_mce/plugins/noneditable/editor_plugin_src.js
plugins/newsletter/tiny_mce/plugins/table/cell.htm
plugins/newsletter/tiny_mce/plugins/table/css/cell.css
plugins/newsletter/tiny_mce/plugins/table/css/row.css
plugins/newsletter/tiny_mce/plugins/table/css/table.css
plugins/newsletter/tiny_mce/plugins/table/js/cell.js
plugins/newsletter/tiny_mce/plugins/table/js/merge_cells.js
plugins/newsletter/tiny_mce/plugins/table/js/row.js
plugins/newsletter/tiny_mce/plugins/table/js/table.js
plugins/newsletter/tiny_mce/plugins/table/merge_cells.htm
plugins/newsletter/tiny_mce/plugins/table/row.htm
plugins/newsletter/tiny_mce/plugins/table/table.htm
plugins/newsletter/tiny_mce/themes/advanced/about.htm
plugins/newsletter/tiny_mce/themes/advanced/anchor.htm
plugins/newsletter/tiny_mce/themes/advanced/charmap.htm
plugins/newsletter/tiny_mce/themes/advanced/color_picker.htm
plugins/newsletter/tiny_mce/themes/advanced/editor_template_src.js
plugins/newsletter/tiny_mce/themes/advanced/image.htm
plugins/newsletter/tiny_mce/themes/advanced/js/about.js
plugins/newsletter/tiny_mce/themes/advanced/js/anchor.js
plugins/newsletter/tiny_mce/themes/advanced/js/charmap.js
plugins/newsletter/tiny_mce/themes/advanced/js/image.js
plugins/newsletter/tiny_mce/themes/advanced/js/link.js
plugins/newsletter/tiny_mce/themes/advanced/js/source_editor.js
plugins/newsletter/tiny_mce/themes/advanced/link.htm
plugins/newsletter/tiny_mce/themes/advanced/shortcuts.htm
plugins/newsletter/tiny_mce/themes/advanced/skins/default/content.css
plugins/newsletter/tiny_mce/themes/advanced/skins/default/dialog.css
plugins/newsletter/tiny_mce/themes/advanced/skins/default/ui.css

plugins/newsletter/tiny_mce/themes/advanced/skins/highcontrast/content.c
ss

plugins/newsletter/tiny_mce/themes/advanced/skins/highcontrast/dialog.cs
s
plugins/newsletter/tiny_mce/themes/advanced/skins/highcontrast/ui.css
plugins/newsletter/tiny_mce/themes/advanced/skins/o2k7/content.css
plugins/newsletter/tiny_mce/themes/advanced/skins/o2k7/dialog.css
plugins/newsletter/tiny_mce/themes/advanced/skins/o2k7/ui.css
plugins/newsletter/tiny_mce/themes/advanced/skins/o2k7/ui_black.css
plugins/newsletter/tiny_mce/themes/advanced/skins/o2k7/ui_silver.css
plugins/newsletter/tiny_mce/themes/advanced/source_editor.htm
plugins/newsletter/tiny_mce/utils/editable_selects.js
plugins/newsletter/tiny_mce/utils/form_utils.js
plugins/newsletter/tiny_mce/utils/mctabs.js
plugins/newsletter/tiny_mce/utils/validate.js
plugins/newsletter/users/edit.php
plugins/newsletter/users/index-old.php
plugins/newsletter/users/index.php
plugins/newsletter/users/massive.php
plugins/newsletter/users/menu.inc.php
plugins/newsletter/users/new.php
plugins/newsletter/users/users.php
Merge branch 'master' of https://github.com/izmayoub/OurRand

Conflicts:
	plugins/ayb_members/main.php
	plugins/shortcodes-ultimate/inc/core/admin-views.php
	plugins/shortcodes-ultimate/inc/core/load.php
	plugins/shortcodes-ultimate/inc/vendor/sunrise.php
	plugins/shortcodes-ultimate/readme.txt
	plugins/shortcodes-ultimate/shortcodes-ultimate.php