Moved facet-widget directory
Moved facet-widget
Reset permissions
Synced with 1.2.4 changes
Too many parentheses
Edited facet-widget
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master' into myVersion
Map widget in progress
Fixed facet-widget relative paths
Beginnings of charts widget
Work on Chart Widget
Charts widget working, Maps Widget still needs work
Merge branch 'myVersion' of https://github.com/scottrice10/wordpress-fantastic-elasticsearch

Conflicts:
	elasticsearch.php
	facet-widget/lang/taxonomies-filter-widget-en_US.mo
	facet-widget/lang/taxonomies-filter-widget-en_US.po
	facet-widget/lang/taxonomies-filter-widget-ro_RO.mo
	facet-widget/lang/taxonomies-filter-widget-ro_RO.po
	lib/charts-widget/lang/taxonomies-filter-widget-en_US.mo
	lib/charts-widget/lang/taxonomies-filter-widget-en_US.po
	lib/charts-widget/lang/taxonomies-filter-widget-ro_RO.mo
	lib/charts-widget/lang/taxonomies-filter-widget-ro_RO.po
	lib/facet-widget/lang/plugin.po
	lib/facet-widget/lang/taxonomies-filter-widget-en_US.mo
	lib/facet-widget/lang/taxonomies-filter-widget-en_US.po
	lib/facet-widget/lang/taxonomies-filter-widget-ro_RO.mo
	lib/facet-widget/lang/taxonomies-filter-widget-ro_RO.po
Fixed git sub-module
 Please enter the commit message for your changes. Lines starting
Now fixed git sub-module
Reset permissions
Closed admin divs
Fixed permissions
Merge branch 'rice2.0.0-wip'

Conflicts:
	api/Defaults.php
	api/Indexer.php
	elasticsearch.php
	lib/facet-widget/lang/taxonomies-filter-widget-en_US.mo
	lib/facet-widget/lang/taxonomies-filter-widget-en_US.po
	lib/facet-widget/lang/taxonomies-filter-widget-ro_RO.mo
	lib/facet-widget/lang/taxonomies-filter-widget-ro_RO.po
	lib/map-widget/lang/taxonomies-filter-widget-en_US.mo
	lib/map-widget/lang/taxonomies-filter-widget-en_US.po
	lib/map-widget/lang/taxonomies-filter-widget-ro_RO.mo
	lib/map-widget/lang/taxonomies-filter-widget-ro_RO.po
	wp/lib/charts-widget/lang/taxonomies-filter-widget-en_US.mo
	wp/lib/charts-widget/lang/taxonomies-filter-widget-en_US.po
	wp/lib/charts-widget/lang/taxonomies-filter-widget-ro_RO.mo
	wp/lib/charts-widget/lang/taxonomies-filter-widget-ro_RO.po
	wp/lib/facet-widget/facet-widget.php
	wp/lib/nhp/options/options.php