SERVER video update
Merge branch 'master' of https://github.com/jmeharq/AndroidVideoStream
Merge branch 'master' of https://github.com/jmeharq/AndroidVideoStream