allow users to be marked as inactive
Re-generate assets
Merge branch 'master' into bulk_solr_load3