Courses removed and socke.io fix
Pre release merge