Adding Server
Merge branch 'master' of https://github.com/onaclov2000/CaelumMediaPlayer