Merge branch 'researcher_stats'
Merge branch 'researcher_stats'
Merge branch 'researcher_stats'
Trying to fix css asset compiling
Modifying production config to try to fix static assets
Temporarily changing staging config settings
Merge branch 'master' into researcher_stats
changing staging config back to original