from stas
Merge remote-tracking branch 'origin/image_ajax' into image_ajax

Conflicts:
	solr/data/development/index/segments.gen