resolve conflicts
fixing broadcast
Merge branch 'development'
fixing the stuff on live
removing stupid extra audio tag