update
update footer
test
Added wp-content
image folder
Merge branch 'test' of https://github.com/sohel4r/wordpress into test

Conflicts:
	wordpress.sql
	wp-content/plugins/breadcrumb-trail/breadcrumb-trail.php
	wp-content/plugins/breadcrumb-trail/inc/breadcrumbs.php
	wp-content/plugins/breadcrumb-trail/license.txt
	wp-content/plugins/breadcrumb-trail/readme.md
	wp-content/plugins/breadcrumb-trail/readme.txt
	wp-content/plugins/display-widgets/languages/display-widgets-fr_FR.mo
	wp-content/plugins/display-widgets/languages/display-widgets-fr_FR.po
	wp-content/plugins/display-widgets/languages/display-widgets-he_IL.mo
	wp-content/plugins/display-widgets/languages/display-widgets-he_IL.po
	wp-content/plugins/display-widgets/languages/display-widgets-it_IT.po
	wp-content/plugins/display-widgets/languages/display-widgets-ja.mo
	wp-content/plugins/display-widgets/languages/display-widgets-ja.po
	wp-content/plugins/display-widgets/languages/display-widgets-pl_PL.mo
	wp-content/plugins/display-widgets/languages/display-widgets-pl_PL.po
	wp-content/plugins/meteor-slides/css/meteor-slides-admin.css
	wp-content/plugins/meteor-slides/css/meteor-slides.css
	wp-content/plugins/meteor-slides/images/buttons.gif
	wp-content/plugins/meteor-slides/images/buttons.png
	wp-content/plugins/meteor-slides/images/next.gif
	wp-content/plugins/meteor-slides/images/next.png
	wp-content/plugins/meteor-slides/images/prev.gif
	wp-content/plugins/meteor-slides/images/prev.png
	wp-content/plugins/meteor-slides/includes/meteor-slides-admin.php
	wp-content/plugins/meteor-slides/includes/meteor-slides-settings.php
	wp-content/plugins/meteor-slides/includes/meteor-slideshow.php
	wp-content/plugins/meteor-slides/js/jquery.cycle.all.js
	wp-content/plugins/meteor-slides/js/jquery.metadata.v2.js
	wp-content/plugins/meteor-slides/js/jquery.touchwipe.1.1.1.js
	wp-content/plugins/meteor-slides/js/slideshow.js
	wp-content/plugins/meteor-slides/languages/meteor-slides-be_BY.mo
	wp-content/plugins/meteor-slides/languages/meteor-slides-be_BY.po
	wp-content/plugins/meteor-slides/languages/meteor-slides-bg_BG.mo
	wp-content/plugins/meteor-slides/languages/meteor-slides-bg_BG.po
	wp-content/plugins/meteor-slides/languages/meteor-slides-cs_CZ.mo
	wp-content/plugins/meteor-slides/languages/meteor-slides-cs_CZ.po
	wp-content/plugins/meteor-slides/languages/meteor-slides-da_DK.mo
	wp-content/plugins/meteor-slides/languages/meteor-slides-da_DK.po
	wp-content/plugins/meteor-slides/languages/meteor-slides-de_DE.mo
	wp-content/plugins/meteor-slides/languages/meteor-slides-de_DE.po
	wp-content/plugins/meteor-slides/languages/meteor-slides-el.mo
	wp-content/plugins/meteor-slides/languages/meteor-slides-el.po
	wp-content/plugins/meteor-slides/languages/meteor-slides-en_US.mo
	wp-content/plugins/meteor-slides/languages/meteor-slides-en_US.po
	wp-content/plugins/meteor-slides/languages/meteor-slides-en_US.txt
	wp-content/plugins/meteor-slides/languages/meteor-slides-es_ES.mo
	wp-content/plugins/meteor-slides/languages/meteor-slides-es_ES.po
	wp-content/plugins/meteor-slides/languages/meteor-slides-fa_IR.mo
	wp-content/plugins/meteor-slides/languages/meteor-slides-fa_IR.po
	wp-content/plugins/meteor-slides/languages/meteor-slides-fr_FR.mo
	wp-content/plugins/meteor-slides/languages/meteor-slides-fr_FR.po
	wp-content/plugins/meteor-slides/languages/meteor-slides-he_IL.mo
	wp-content/plugins/meteor-slides/languages/meteor-slides-he_IL.po
	wp-content/plugins/meteor-slides/languages/meteor-slides-id_ID.mo
	wp-content/plugins/meteor-slides/languages/meteor-slides-id_ID.po
	wp-content/plugins/meteor-slides/languages/meteor-slides-it_IT.mo
	wp-content/plugins/meteor-slides/languages/meteor-slides-it_IT.po
	wp-content/plugins/meteor-slides/languages/meteor-slides-ja.mo
	wp-content/plugins/meteor-slides/languages/meteor-slides-ja.po
	wp-content/plugins/meteor-slides/languages/meteor-slides-nl_NL.mo
	wp-content/plugins/meteor-slides/languages/meteor-slides-nl_NL.po
	wp-content/plugins/meteor-slides/languages/meteor-slides-pl_PL.mo
	wp-content/plugins/meteor-slides/languages/meteor-slides-pl_PL.po
	wp-content/plugins/meteor-slides/languages/meteor-slides-pt_BR.mo
	wp-content/plugins/meteor-slides/languages/meteor-slides-pt_BR.po
	wp-content/plugins/meteor-slides/languages/meteor-slides-pt_PT.mo
	wp-content/plugins/meteor-slides/languages/meteor-slides-pt_PT.po
	wp-content/plugins/meteor-slides/languages/meteor-slides-ro_RO.mo
	wp-content/plugins/meteor-slides/languages/meteor-slides-ro_RO.po
	wp-content/plugins/meteor-slides/languages/meteor-slides-ru_RU.mo
	wp-content/plugins/meteor-slides/languages/meteor-slides-ru_RU.po
	wp-content/plugins/meteor-slides/languages/meteor-slides-sr_RS.mo
	wp-content/plugins/meteor-slides/languages/meteor-slides-sr_RS.po
	wp-content/plugins/meteor-slides/languages/meteor-slides-sv_SE.mo
	wp-content/plugins/meteor-slides/languages/meteor-slides-sv_SE.po
	wp-content/plugins/meteor-slides/languages/meteor-slides-tr_TR.mo
	wp-content/plugins/meteor-slides/languages/meteor-slides-tr_TR.po
	wp-content/plugins/meteor-slides/languages/meteor-slides-vi.mo
	wp-content/plugins/meteor-slides/languages/meteor-slides-vi.po
	wp-content/plugins/meteor-slides/languages/meteor-slides-zh_CN.mo
	wp-content/plugins/meteor-slides/languages/meteor-slides-zh_CN.po
	wp-content/plugins/meteor-slides/languages/meteor-slides-zh_TW.mo
	wp-content/plugins/meteor-slides/languages/meteor-slides-zh_TW.po
	wp-content/plugins/meteor-slides/languages/meteor-slides.pot
	wp-content/plugins/meteor-slides/meteor-slides-plugin.php
	wp-content/plugins/meteor-slides/readme.md
	wp-content/plugins/meteor-slides/readme.txt
	wp-content/plugins/meteor-slides/screenshot-1.jpg
	wp-content/plugins/meteor-slides/screenshot-2.jpg
	wp-content/plugins/meteor-slides/screenshot-3.jpg
	wp-content/plugins/meteor-slides/screenshot-4.jpg
	wp-content/plugins/meteor-slides/screenshot-5.jpg
	wp-content/plugins/meteor-slides/screenshot-6.jpg
	wp-content/plugins/meteor-slides/screenshot-7.jpg
	wp-content/plugins/meteor-slides/uninstall.php
	wp-content/plugins/store_locator_wpress/admin/options.php
	wp-content/plugins/store_locator_wpress/admin/options/css/custom.css
	wp-content/plugins/store_locator_wpress/admin/options/css/jquery-ui-aristo/aristo.css
	wp-content/plugins/store_locator_wpress/admin/options/css/jquery-ui-aristo/images/icon_sprite.png
	wp-content/plugins/store_locator_wpress/admin/options/css/jquery-ui-aristo/images/progress_bar.gif
	wp-content/plugins/store_locator_wpress/admin/options/css/jquery-ui-aristo/images/slider_handles.png
	wp-content/plugins/store_locator_wpress/admin/options/css/jquery-ui-aristo/images/ui-icons_222222_256x240.png
	wp-content/plugins/store_locator_wpress/admin/options/css/jquery-ui-aristo/images/ui-icons_454545_256x240.png
	wp-content/plugins/store_locator_wpress/admin/options/css/options.css
	wp-content/plugins/store_locator_wpress/admin/options/fields/button_set/field_button_set.js
	wp-content/plugins/store_locator_wpress/admin/options/fields/button_set/field_button_set.php
	wp-content/plugins/store_locator_wpress/admin/options/fields/cats_multi_select/field_cats_multi_select.php
	wp-content/plugins/store_locator_wpress/admin/options/fields/cats_select/field_cats_select.php
	wp-content/plugins/store_locator_wpress/admin/options/fields/checkbox/field_checkbox.php
	wp-content/plugins/store_locator_wpress/admin/options/fields/checkbox_hide_below/field_checkbox_hide_below.js
	wp-content/plugins/store_locator_wpress/admin/options/fields/checkbox_hide_below/field_checkbox_hide_below.php
	wp-content/plugins/store_locator_wpress/admin/options/fields/color/field_color.js
	wp-content/plugins/store_locator_wpress/admin/options/fields/color/field_color.php
	wp-content/plugins/store_locator_wpress/admin/options/fields/color_gradient/field_color_gradient.php
	wp-content/plugins/store_locator_wpress/admin/options/fields/date/field_date.js
	wp-content/plugins/store_locator_wpress/admin/options/fields/date/field_date.php
	wp-content/plugins/store_locator_wpress/admin/options/fields/divide/field_divide.php
	wp-content/plugins/store_locator_wpress/admin/options/fields/editor/field_editor.php
	wp-content/plugins/store_locator_wpress/admin/options/fields/google_webfonts/field_google_webfonts.php
	wp-content/plugins/store_locator_wpress/admin/options/fields/info/field_info.php
	wp-content/plugins/store_locator_wpress/admin/options/fields/menu_location_select/field_menu_location_select.php
	wp-content/plugins/store_locator_wpress/admin/options/fields/menu_select/field_menu_select.php
	wp-content/plugins/store_locator_wpress/admin/options/fields/multi_checkbox/field_multi_checkbox.php
	wp-content/plugins/store_locator_wpress/admin/options/fields/multi_select/field_multi_select.php
	wp-content/plugins/store_locator_wpress/admin/options/fields/multi_text/field_multi_text.js
	wp-content/plugins/store_locator_wpress/admin/options/fields/multi_text/field_multi_text.php
	wp-content/plugins/store_locator_wpress/admin/options/fields/pages_multi_select/field_pages_multi_select.php
	wp-content/plugins/store_locator_wpress/admin/options/fields/pages_select/field_pages_select.php
	wp-content/plugins/store_locator_wpress/admin/options/fields/post_type_select/field_post_type_select.php
	wp-content/plugins/store_locator_wpress/admin/options/fields/posts_multi_select/field_posts_multi_select.php
	wp-content/plugins/store_locator_wpress/admin/options/fields/posts_select/field_posts_select.php
	wp-content/plugins/store_locator_wpress/admin/options/fields/radio/field_radio.php
	wp-content/plugins/store_locator_wpress/admin/options/fields/radio_img/field_radio_img.js
	wp-content/plugins/store_locator_wpress/admin/options/fields/radio_img/field_radio_img.php
	wp-content/plugins/store_locator_wpress/admin/options/fields/select/field_select.php
	wp-content/plugins/store_locator_wpress/admin/options/fields/select_hide_below/field_select_hide_below.js
	wp-content/plugins/store_locator_wpress/admin/options/fields/select_hide_below/field_select_hide_below.php
	wp-content/plugins/store_locator_wpress/admin/options/fields/tags_multi_select/field_tags_multi_select.php
	wp-content/plugins/store_locator_wpress/admin/options/fields/tags_select/field_tags_select.php
	wp-content/plugins/store_locator_wpress/admin/options/fields/text/field_text.php
	wp-content/plugins/store_locator_wpress/admin/options/fields/textarea/field_textarea.php
	wp-content/plugins/store_locator_wpress/admin/options/fields/upload/blank.png
	wp-content/plugins/store_locator_wpress/admin/options/fields/upload/field_upload.js
	wp-content/plugins/store_locator_wpress/admin/options/fields/upload/field_upload.php
	wp-content/plugins/store_locator_wpress/admin/options/img/icons/glyphicons_019_cogwheel.png
	wp-content/plugins/store_locator_wpress/admin/options/img/icons/glyphicons_190_circle_plus.png
	wp-content/plugins/store_locator_wpress/admin/options/img/icons/glyphicons_191_circle_minus.png
	wp-content/plugins/store_locator_wpress/admin/options/img/icons/glyphicons_192_circle_remove.png
	wp-content/plugins/store_locator_wpress/admin/options/img/icons/glyphicons_193_circle_ok.png
	wp-content/plugins/store_locator_wpress/admin/options/img/icons/glyphicons_194_circle_question_mark.png
	wp-content/plugins/store_locator_wpress/admin/options/img/icons/glyphicons_195_circle_info.png
	wp-content/plugins/store_locator_wpress/admin/options/img/icons/glyphicons_320_facebook.png
	wp-content/plugins/store_locator_wpress/admin/options/img/icons/glyphicons_321_twitter_t.png
	wp-content/plugins/store_locator_wpress/admin/options/img/icons/glyphicons_322_twitter.png
	wp-content/plugins/store_locator_wpress/admin/options/img/icons/glyphicons_323_buzz.png
	wp-content/plugins/store_locator_wpress/admin/options/img/icons/glyphicons_324_vimeo.png
	wp-content/plugins/store_locator_wpress/admin/options/img/icons/glyphicons_325_flickr.png
	wp-content/plugins/store_locator_wpress/admin/options/img/icons/glyphicons_326_last_fm.png
	wp-content/plugins/store_locator_wpress/admin/options/img/icons/glyphicons_327_rss.png
	wp-content/plugins/store_locator_wpress/admin/options/img/icons/glyphicons_328_skype.png
	wp-content/plugins/store_locator_wpress/admin/options/img/icons/glyphicons_329_e-mail.png
	wp-content/plugins/store_locator_wpress/admin/options/img/icons/glyphicons_331_evernote.png
	wp-content/plugins/store_locator_wpress/admin/options/img/icons/glyphicons_332_xing.png
	wp-content/plugins/store_locator_wpress/admin/options/img/icons/glyphicons_334_dribbble.png
	wp-content/plugins/store_locator_wpress/admin/options/img/icons/glyphicons_335_deviantart.png
	wp-content/plugins/store_locator_wpress/admin/options/img/icons/glyphicons_337_linked_in.png
	wp-content/plugins/store_locator_wpress/admin/options/img/icons/glyphicons_339_pinboard.png
	wp-content/plugins/store_locator_wpress/admin/options/img/icons/glyphicons_342_youtube.png
	wp-content/plugins/store_locator_wpress/admin/options/img/icons/glyphicons_344_4square.png
	wp-content/plugins/store_locator_wpress/admin/options/img/menu_icon.png
	wp-content/plugins/store_locator_wpress/admin/options/js/options.js
	wp-content/plugins/store_locator_wpress/admin/options/options.php
	wp-content/plugins/store_locator_wpress/admin/options/validation/color/validation_color.php
	wp-content/plugins/store_locator_wpress/admin/options/validation/comma_numeric/validation_comma_numeric.php
	wp-content/plugins/store_locator_wpress/admin/options/validation/date/validation_date.php
	wp-content/plugins/store_locator_wpress/admin/options/validation/email/validation_email.php
	wp-content/plugins/store_locator_wpress/admin/options/validation/html/validation_html.php
	wp-content/plugins/store_locator_wpress/admin/options/validation/html_custom/validation_html_custom.php
	wp-content/plugins/store_locator_wpress/admin/options/validation/js/validation_js.php
	wp-content/plugins/store_locator_wpress/admin/options/validation/no_html/validation_no_html.php
	wp-content/plugins/store_locator_wpress/admin/options/validation/no_special_chars/validation_no_special_chars.php
	wp-content/plugins/store_locator_wpress/admin/options/validation/numeric/validation_numeric.php
	wp-content/plugins/store_locator_wpress/admin/options/validation/preg_replace/validation_preg_replace.php
	wp-content/plugins/store_locator_wpress/admin/options/validation/str_replace/validation_str_replace.php
	wp-content/plugins/store_locator_wpress/admin/options/validation/url/validation_url.php
	wp-content/themes/child-twentyfourteen/footer.php
	wp-content/themes/child-twentyfourteen/functions.php
	wp-content/themes/child-twentyfourteen/index.php
	wp-content/themes/child-twentyfourteen/js/viewer.js
	wp-content/themes/child-twentyfourteen/page-one-column.php
	wp-content/themes/child-twentyfourteen/style.css
	wp-content/themes/twentyfourteen/content-featured-post.php
	wp-content/themes/twentyfourteen/content.php
	wp-content/themes/twentyfourteen/sidebar-footer.php
	wp-content/uploads/2014/12/photo.php_.jpeg
	wp-content/uploads/connections-images/index.php
remove sql file
add by tania
Merge pull request #4 from taniaadmin/test

Test
Merge pull request #5 from sohel4r/test

Test