Created basic flow for the merge method.
Added getPlayer(id), getCreature(id).
Merge branch 'master' of git://github.com/maikelsteneker/tue-2io23