Added Server stuff to MainActivity
Merge remote-tracking branch 'origin/master' into Colin