Add pusher to stream photos instantaneously
fix merge conflicts
Fix more merge conflicts
Add current user to pusher trigger