new template
new template
new template
new template
Merge remote-tracking branch 'origin/master'

Conflicts:
	readme.html
	wp-admin/about.php
	wp-admin/credits.php
	wp-admin/css/edit-rtl.css
	wp-admin/css/edit.css
	wp-admin/css/forms-rtl.css
	wp-admin/css/forms.css
	wp-admin/css/login-rtl.min.css
	wp-admin/css/login.min.css
	wp-admin/css/wp-admin-rtl.min.css
	wp-admin/css/wp-admin.min.css
	wp-admin/custom-header.php
	wp-admin/freedoms.php
	wp-admin/includes/ajax-actions.php
	wp-admin/js/customize-controls.js
	wp-admin/js/customize-controls.min.js
	wp-admin/js/post.js
	wp-admin/js/post.min.js
	wp-admin/user/menu.php
	wp-content/plugins/author-avatars/author-avatars.php
	wp-content/plugins/author-avatars/css/admin-form.css
	wp-content/plugins/author-avatars/css/shortcode.css
	wp-content/plugins/author-avatars/css/widget.css
	wp-content/plugins/author-avatars/js/AuthorAvatarsShortcode.paging.ajax.js
	wp-content/plugins/author-avatars/js/form.js
	wp-content/plugins/author-avatars/js/jquery-ui.resizable.js
	wp-content/plugins/author-avatars/js/tinymce.popup.js
	wp-content/plugins/author-avatars/js/widget.admin.js
	wp-content/plugins/author-avatars/lib/AuthorAvatars.class.php
	wp-content/plugins/author-avatars/lib/AuthorAvatarsEditorButton.class.php
	wp-content/plugins/author-avatars/lib/AuthorAvatarsForm.class.php
	wp-content/plugins/author-avatars/lib/AuthorAvatarsSettings.class.php
	wp-content/plugins/author-avatars/lib/AuthorAvatarsShortcode.class.php
	wp-content/plugins/author-avatars/lib/AuthorAvatarsSitewideAdminPanel.class.php
	wp-content/plugins/author-avatars/lib/AuthorAvatarsWidget.class.php
	wp-content/plugins/author-avatars/lib/FormHelper.class.php
	wp-content/plugins/author-avatars/lib/MultiWidget.class.php
	wp-content/plugins/author-avatars/lib/ShowAvatarShortcode.class.php
	wp-content/plugins/author-avatars/lib/UserList.class.php
	wp-content/plugins/author-avatars/lib/helper.functions.php
	wp-content/plugins/author-avatars/tinymce/editor_plugin.js
	wp-content/plugins/author-avatars/tinymce/langs/be.js
	wp-content/plugins/author-avatars/tinymce/langs/de.js
	wp-content/plugins/author-avatars/tinymce/langs/en.js
	wp-content/plugins/author-avatars/tinymce/langs/hi.js
	wp-content/plugins/author-avatars/tinymce/langs/it.js
	wp-content/plugins/author-avatars/tinymce/langs/nl.js
	wp-content/plugins/author-avatars/tinymce/langs/pt.js
	wp-content/plugins/author-avatars/tinymce/langs/ro.js
	wp-content/plugins/author-avatars/uninstall.php
	wp-content/plugins/google-maps-widget/css/gmw-admin.css
	wp-content/plugins/google-maps-widget/css/gmw.css
	wp-content/plugins/google-maps-widget/gmw-tracking.php
	wp-content/plugins/google-maps-widget/gmw-widget.php
	wp-content/plugins/google-maps-widget/google-maps-widget.php
	wp-content/plugins/google-maps-widget/index.php
	wp-content/plugins/google-maps-widget/js/gmw-admin.js
	wp-content/plugins/google-maps-widget/js/gmw.js
	wp-content/plugins/google-maps-widget/js/jquery.colorbox-min.js
	wp-content/plugins/google-maps-widget/js/jquery.cookie.js
	wp-content/plugins/profile-builder/assets/css/back.end.css
	wp-content/plugins/profile-builder/assets/css/front.end.css
	wp-content/plugins/profile-builder/assets/css/hobbyist.style.css
	wp-content/plugins/profile-builder/assets/css/premium.style.css
	wp-content/plugins/profile-builder/assets/css/style.css
	wp-content/plugins/profile-builder/assets/js/back.end.js
	wp-content/plugins/profile-builder/assets/js/jquery.extra.fields.js
	wp-content/plugins/profile-builder/assets/misc/wppb.fallback.page.php
	wp-content/plugins/profile-builder/classes/class.admin.php
	wp-content/plugins/profile-builder/classes/class.bulk.approve.unapprove.php
	wp-content/plugins/profile-builder/classes/class.email.confirmation.php
	wp-content/plugins/profile-builder/front-end/wppb.edit.profile.php
	wp-content/plugins/profile-builder/front-end/wppb.login.php
	wp-content/plugins/profile-builder/front-end/wppb.recover.password.php
	wp-content/plugins/profile-builder/front-end/wppb.register.php
	wp-content/plugins/profile-builder/functions/admin.bar.php
	wp-content/plugins/profile-builder/functions/basic.info.php
	wp-content/plugins/profile-builder/functions/default.settings.php
	wp-content/plugins/profile-builder/functions/email.confirmation.php
	wp-content/plugins/profile-builder/functions/functions.load.php
	wp-content/plugins/profile-builder/functions/general.settings.php
	wp-content/plugins/profile-builder/functions/options.php
	wp-content/plugins/profile-builder/index.php
	wp-content/plugins/profile-builder/uninstall.php
	wp-content/plugins/taxonomy-terms-order/css/to.css
	wp-content/plugins/taxonomy-terms-order/include/functions.php
	wp-content/plugins/taxonomy-terms-order/include/interface.php
	wp-content/plugins/taxonomy-terms-order/include/options.php
	wp-content/plugins/taxonomy-terms-order/include/terms_walker.php
	wp-content/plugins/taxonomy-terms-order/js/to-javascript.js
	wp-content/plugins/taxonomy-terms-order/taxonomy-terms-order.php
	wp-content/plugins/wp-native-dashboard/automattic.php
	wp-content/plugins/wp-native-dashboard/css/style-rtl.css
	wp-content/plugins/wp-native-dashboard/css/style.css
	wp-content/plugins/wp-native-dashboard/css/ui.all.css
	wp-content/plugins/wp-native-dashboard/langswitcher.php
	wp-content/plugins/wp-native-dashboard/loginselector.php
	wp-content/plugins/wp-native-dashboard/personalprofile.php
	wp-content/plugins/wp-native-dashboard/wp-native-dashboard.php
	wp-content/themes/Kuliany/category.php
	wp-content/themes/Kuliany/content-image.php
	wp-content/themes/Kuliany/content.php
	wp-content/themes/Kuliany/footer.php
	wp-content/themes/Kuliany/functions.php
	wp-content/themes/Kuliany/header.php
	wp-content/themes/Kuliany/inc/tags.php
	wp-content/themes/Kuliany/index.php
	wp-content/themes/Kuliany/style.css
	wp-includes/class-wp-editor.php
	wp-includes/css/editor-rtl.css
	wp-includes/css/editor-rtl.min.css
	wp-includes/css/editor.css
	wp-includes/css/editor.min.css
	wp-includes/css/media-views-rtl.css
	wp-includes/css/media-views-rtl.min.css
	wp-includes/css/media-views.css
	wp-includes/css/media-views.min.css
	wp-includes/default-widgets.php
	wp-includes/js/customize-models.js
	wp-includes/js/customize-models.min.js
	wp-includes/js/customize-views.js
	wp-includes/js/customize-views.min.js
	wp-includes/js/mce-view.js
	wp-includes/js/mce-view.min.js
	wp-includes/js/media-audiovideo.js
	wp-includes/js/media-audiovideo.min.js
	wp-includes/js/media-views.js
	wp-includes/js/media-views.min.js
	wp-includes/js/mediaelement/wp-mediaelement.css
	wp-includes/js/mediaelement/wp-playlist.js
	wp-includes/js/shortcode.js
	wp-includes/js/shortcode.min.js
	wp-includes/js/tinymce/plugins/wordpress/plugin.js
	wp-includes/js/tinymce/plugins/wordpress/plugin.min.js
	wp-includes/js/tinymce/plugins/wpeditimage/plugin.js
	wp-includes/js/tinymce/plugins/wpeditimage/plugin.min.js
	wp-includes/js/tinymce/plugins/wplink/plugin.js
	wp-includes/js/tinymce/plugins/wplink/plugin.min.js
	wp-includes/js/tinymce/plugins/wpview/plugin.js
	wp-includes/js/tinymce/plugins/wpview/plugin.min.js
	wp-includes/media-template.php
	wp-includes/media.php
	wp-includes/ms-load.php
	wp-includes/ms-settings.php
	wp-includes/script-loader.php
	wp-includes/widgets.php
Merge remote-tracking branch 'origin/master'

Conflicts:
	readme.html
	wp-admin/about.php
	wp-admin/credits.php
	wp-admin/css/edit-rtl.css
	wp-admin/css/edit.css
	wp-admin/css/forms-rtl.css
	wp-admin/css/forms.css
	wp-admin/css/login-rtl.min.css
	wp-admin/css/login.min.css
	wp-admin/css/wp-admin-rtl.min.css
	wp-admin/css/wp-admin.min.css
	wp-admin/custom-header.php
	wp-admin/freedoms.php
	wp-admin/includes/ajax-actions.php
	wp-admin/js/customize-controls.js
	wp-admin/js/customize-controls.min.js
	wp-admin/js/post.js
	wp-admin/js/post.min.js
	wp-admin/user/menu.php
	wp-content/plugins/author-avatars/author-avatars.php
	wp-content/plugins/author-avatars/css/admin-form.css
	wp-content/plugins/author-avatars/css/shortcode.css
	wp-content/plugins/author-avatars/css/widget.css
	wp-content/plugins/author-avatars/js/AuthorAvatarsShortcode.paging.ajax.js
	wp-content/plugins/author-avatars/js/form.js
	wp-content/plugins/author-avatars/js/jquery-ui.resizable.js
	wp-content/plugins/author-avatars/js/tinymce.popup.js
	wp-content/plugins/author-avatars/js/widget.admin.js
	wp-content/plugins/author-avatars/lib/AuthorAvatars.class.php
	wp-content/plugins/author-avatars/lib/AuthorAvatarsEditorButton.class.php
	wp-content/plugins/author-avatars/lib/AuthorAvatarsForm.class.php
	wp-content/plugins/author-avatars/lib/AuthorAvatarsSettings.class.php
	wp-content/plugins/author-avatars/lib/AuthorAvatarsShortcode.class.php
	wp-content/plugins/author-avatars/lib/AuthorAvatarsSitewideAdminPanel.class.php
	wp-content/plugins/author-avatars/lib/AuthorAvatarsWidget.class.php
	wp-content/plugins/author-avatars/lib/FormHelper.class.php
	wp-content/plugins/author-avatars/lib/MultiWidget.class.php
	wp-content/plugins/author-avatars/lib/ShowAvatarShortcode.class.php
	wp-content/plugins/author-avatars/lib/UserList.class.php
	wp-content/plugins/author-avatars/lib/helper.functions.php
	wp-content/plugins/author-avatars/tinymce/editor_plugin.js
	wp-content/plugins/author-avatars/tinymce/langs/be.js
	wp-content/plugins/author-avatars/tinymce/langs/de.js
	wp-content/plugins/author-avatars/tinymce/langs/en.js
	wp-content/plugins/author-avatars/tinymce/langs/hi.js
	wp-content/plugins/author-avatars/tinymce/langs/it.js
	wp-content/plugins/author-avatars/tinymce/langs/nl.js
	wp-content/plugins/author-avatars/tinymce/langs/pt.js
	wp-content/plugins/author-avatars/tinymce/langs/ro.js
	wp-content/plugins/author-avatars/uninstall.php
	wp-content/plugins/google-maps-widget/css/gmw-admin.css
	wp-content/plugins/google-maps-widget/css/gmw.css
	wp-content/plugins/google-maps-widget/gmw-tracking.php
	wp-content/plugins/google-maps-widget/gmw-widget.php
	wp-content/plugins/google-maps-widget/google-maps-widget.php
	wp-content/plugins/google-maps-widget/index.php
	wp-content/plugins/google-maps-widget/js/gmw-admin.js
	wp-content/plugins/google-maps-widget/js/gmw.js
	wp-content/plugins/google-maps-widget/js/jquery.colorbox-min.js
	wp-content/plugins/google-maps-widget/js/jquery.cookie.js
	wp-content/plugins/profile-builder/assets/css/back.end.css
	wp-content/plugins/profile-builder/assets/css/front.end.css
	wp-content/plugins/profile-builder/assets/css/hobbyist.style.css
	wp-content/plugins/profile-builder/assets/css/premium.style.css
	wp-content/plugins/profile-builder/assets/css/style.css
	wp-content/plugins/profile-builder/assets/js/back.end.js
	wp-content/plugins/profile-builder/assets/js/jquery.extra.fields.js
	wp-content/plugins/profile-builder/assets/misc/wppb.fallback.page.php
	wp-content/plugins/profile-builder/classes/class.admin.php
	wp-content/plugins/profile-builder/classes/class.bulk.approve.unapprove.php
	wp-content/plugins/profile-builder/classes/class.email.confirmation.php
	wp-content/plugins/profile-builder/front-end/wppb.edit.profile.php
	wp-content/plugins/profile-builder/front-end/wppb.login.php
	wp-content/plugins/profile-builder/front-end/wppb.recover.password.php
	wp-content/plugins/profile-builder/front-end/wppb.register.php
	wp-content/plugins/profile-builder/functions/admin.bar.php
	wp-content/plugins/profile-builder/functions/basic.info.php
	wp-content/plugins/profile-builder/functions/default.settings.php
	wp-content/plugins/profile-builder/functions/email.confirmation.php
	wp-content/plugins/profile-builder/functions/functions.load.php
	wp-content/plugins/profile-builder/functions/general.settings.php
	wp-content/plugins/profile-builder/functions/options.php
	wp-content/plugins/profile-builder/index.php
	wp-content/plugins/profile-builder/uninstall.php
	wp-content/plugins/taxonomy-terms-order/css/to.css
	wp-content/plugins/taxonomy-terms-order/include/functions.php
	wp-content/plugins/taxonomy-terms-order/include/interface.php
	wp-content/plugins/taxonomy-terms-order/include/options.php
	wp-content/plugins/taxonomy-terms-order/include/terms_walker.php
	wp-content/plugins/taxonomy-terms-order/js/to-javascript.js
	wp-content/plugins/taxonomy-terms-order/taxonomy-terms-order.php
	wp-content/plugins/wp-native-dashboard/automattic.php
	wp-content/plugins/wp-native-dashboard/css/style-rtl.css
	wp-content/plugins/wp-native-dashboard/css/style.css
	wp-content/plugins/wp-native-dashboard/css/ui.all.css
	wp-content/plugins/wp-native-dashboard/langswitcher.php
	wp-content/plugins/wp-native-dashboard/loginselector.php
	wp-content/plugins/wp-native-dashboard/personalprofile.php
	wp-content/plugins/wp-native-dashboard/wp-native-dashboard.php
	wp-content/themes/Kuliany/category.php
	wp-content/themes/Kuliany/content-image.php
	wp-content/themes/Kuliany/content.php
	wp-content/themes/Kuliany/footer.php
	wp-content/themes/Kuliany/functions.php
	wp-content/themes/Kuliany/header.php
	wp-content/themes/Kuliany/inc/tags.php
	wp-content/themes/Kuliany/index.php
	wp-content/themes/Kuliany/style.css
	wp-includes/class-wp-editor.php
	wp-includes/css/editor-rtl.css
	wp-includes/css/editor-rtl.min.css
	wp-includes/css/editor.css
	wp-includes/css/editor.min.css
	wp-includes/css/media-views-rtl.css
	wp-includes/css/media-views-rtl.min.css
	wp-includes/css/media-views.css
	wp-includes/css/media-views.min.css
	wp-includes/default-widgets.php
	wp-includes/js/customize-models.js
	wp-includes/js/customize-models.min.js
	wp-includes/js/customize-views.js
	wp-includes/js/customize-views.min.js
	wp-includes/js/mce-view.js
	wp-includes/js/mce-view.min.js
	wp-includes/js/media-audiovideo.js
	wp-includes/js/media-audiovideo.min.js
	wp-includes/js/media-views.js
	wp-includes/js/media-views.min.js
	wp-includes/js/mediaelement/wp-mediaelement.css
	wp-includes/js/mediaelement/wp-playlist.js
	wp-includes/js/shortcode.js
	wp-includes/js/shortcode.min.js
	wp-includes/js/tinymce/plugins/wordpress/plugin.js
	wp-includes/js/tinymce/plugins/wordpress/plugin.min.js
	wp-includes/js/tinymce/plugins/wpeditimage/plugin.js
	wp-includes/js/tinymce/plugins/wpeditimage/plugin.min.js
	wp-includes/js/tinymce/plugins/wplink/plugin.js
	wp-includes/js/tinymce/plugins/wplink/plugin.min.js
	wp-includes/js/tinymce/plugins/wpview/plugin.js
	wp-includes/js/tinymce/plugins/wpview/plugin.min.js
	wp-includes/media-template.php
	wp-includes/media.php
	wp-includes/ms-load.php
	wp-includes/ms-settings.php
	wp-includes/script-loader.php
	wp-includes/widgets.php