Initial Branch
Try 1 Merge Meetecho and CleanUp Licode Original