Merge branch 'pref_fix'
Merge branch 'feeds'
mark id's in the html for question event history
timing work
clean out unused reporting code
fix timings calculation
response_time calculations
tweak so it all can be done in sql
additional reporting cleanup
make sure that the call backs, you know, call back
Merge branch 'response_timings' into development