Conflicts: akka-actor/src/main/scala/akka/util/Timeout.scala
* Dining Hakkers Activator template for FSM and become * Cleaup of FSM event matchers to be more usable and consistent
* The Java with Lambda support documentation for AbstractActor and AbstractFSM are now on par with Scala * Many small fixes and additions of missing things * Added an AbstractActorContext that has convenience functions for getChild and getChildren