Merge branch 'refs/heads/master' into active_chat
don't bother with flash message because we're ajaxing anyway

but think about it later
Merge branch 'refs/heads/active_chat'
active chat starting point
Merge branch 'refs/heads/active_chat'