minor changes, some bugs
Changed the hierarchy for actors, to use the cake pattern for intelligent composition
Merge branch 'master' of https://github.com/dadarakt/jamon

Merged simon's changes.