Merged "Kurento Server" and "Media concepts" sections

Change-Id: I019e1cffba440fd195a23ed92ab60e5d8395665c