Added admin interface to force update documents in solr.
Fixed name conflict in solr_update.py
Merge remote-tracking branch 'upstream/master' into validhtml