Remove Parcelables.
Socket handling through service.
Merge remote-tracking branch 'origin/master' into socketservice
Renaming.