Front end and controller work to get bubbles rendering independently for media and comment data
Fixing conflict with merge from repository master