added GSON serialization
Adding actor.
Removing dupe methods from merge.
removed GSON and added play json lib
Fixing timeout.
Adding message types.