Server and actors in different files, some cleaning, getting ready for http
Merge branch 'master' of gh:/dadarakt/jamon