merge code
Merge branch 'master' of https://github.com/hustbill/hello-akka.git

Conflicts:
	src/main/java/metaActor/MetaActorImpt.java