diff --git a/akka-samples/akka-sample-persistence-java-lambda/.gitignore b/akka-samples/akka-sample-persistence-java-lambda/.gitignore
new file mode 100644
index 00000000000..660c959e443
--- /dev/null
+++ b/akka-samples/akka-sample-persistence-java-lambda/.gitignore
@@ -0,0 +1,17 @@
+*#
+*.iml
+*.ipr
+*.iws
+*.pyc
+*.tm.epoch
+*.vim
+*-shim.sbt
+.idea/
+/project/plugins/project
+project/boot
+target/
+/logs
+.cache
+.classpath
+.project
+.settings
\ No newline at end of file
diff --git a/akka-samples/akka-sample-persistence-java-lambda/COPYING b/akka-samples/akka-sample-persistence-java-lambda/COPYING
new file mode 100644
index 00000000000..0e259d42c99
--- /dev/null
+++ b/akka-samples/akka-sample-persistence-java-lambda/COPYING
@@ -0,0 +1,121 @@
+Creative Commons Legal Code
+
+CC0 1.0 Universal
+
+ CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
+ LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN
+ ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
+ INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
+ REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS
+ PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM
+ THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED
+ HEREUNDER.
+
+Statement of Purpose
+
+The laws of most jurisdictions throughout the world automatically confer
+exclusive Copyright and Related Rights (defined below) upon the creator
+and subsequent owner(s) (each and all, an "owner") of an original work of
+authorship and/or a database (each, a "Work").
+
+Certain owners wish to permanently relinquish those rights to a Work for
+the purpose of contributing to a commons of creative, cultural and
+scientific works ("Commons") that the public can reliably and without fear
+of later claims of infringement build upon, modify, incorporate in other
+works, reuse and redistribute as freely as possible in any form whatsoever
+and for any purposes, including without limitation commercial purposes.
+These owners may contribute to the Commons to promote the ideal of a free
+culture and the further production of creative, cultural and scientific
+works, or to gain reputation or greater distribution for their Work in
+part through the use and efforts of others.
+
+For these and/or other purposes and motivations, and without any
+expectation of additional consideration or compensation, the person
+associating CC0 with a Work (the "Affirmer"), to the extent that he or she
+is an owner of Copyright and Related Rights in the Work, voluntarily
+elects to apply CC0 to the Work and publicly distribute the Work under its
+terms, with knowledge of his or her Copyright and Related Rights in the
+Work and the meaning and intended legal effect of CC0 on those rights.
+
+1. Copyright and Related Rights. A Work made available under CC0 may be
+protected by copyright and related or neighboring rights ("Copyright and
+Related Rights"). Copyright and Related Rights include, but are not
+limited to, the following:
+
+ i. the right to reproduce, adapt, distribute, perform, display,
+ communicate, and translate a Work;
+ ii. moral rights retained by the original author(s) and/or performer(s);
+iii. publicity and privacy rights pertaining to a person's image or
+ likeness depicted in a Work;
+ iv. rights protecting against unfair competition in regards to a Work,
+ subject to the limitations in paragraph 4(a), below;
+ v. rights protecting the extraction, dissemination, use and reuse of data
+ in a Work;
+ vi. database rights (such as those arising under Directive 96/9/EC of the
+ European Parliament and of the Council of 11 March 1996 on the legal
+ protection of databases, and under any national implementation
+ thereof, including any amended or successor version of such
+ directive); and
+vii. other similar, equivalent or corresponding rights throughout the
+ world based on applicable law or treaty, and any national
+ implementations thereof.
+
+2. Waiver. To the greatest extent permitted by, but not in contravention
+of, applicable law, Affirmer hereby overtly, fully, permanently,
+irrevocably and unconditionally waives, abandons, and surrenders all of
+Affirmer's Copyright and Related Rights and associated claims and causes
+of action, whether now known or unknown (including existing as well as
+future claims and causes of action), in the Work (i) in all territories
+worldwide, (ii) for the maximum duration provided by applicable law or
+treaty (including future time extensions), (iii) in any current or future
+medium and for any number of copies, and (iv) for any purpose whatsoever,
+including without limitation commercial, advertising or promotional
+purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each
+member of the public at large and to the detriment of Affirmer's heirs and
+successors, fully intending that such Waiver shall not be subject to
+revocation, rescission, cancellation, termination, or any other legal or
+equitable action to disrupt the quiet enjoyment of the Work by the public
+as contemplated by Affirmer's express Statement of Purpose.
+
+3. Public License Fallback. Should any part of the Waiver for any reason
+be judged legally invalid or ineffective under applicable law, then the
+Waiver shall be preserved to the maximum extent permitted taking into
+account Affirmer's express Statement of Purpose. In addition, to the
+extent the Waiver is so judged Affirmer hereby grants to each affected
+person a royalty-free, non transferable, non sublicensable, non exclusive,
+irrevocable and unconditional license to exercise Affirmer's Copyright and
+Related Rights in the Work (i) in all territories worldwide, (ii) for the
+maximum duration provided by applicable law or treaty (including future
+time extensions), (iii) in any current or future medium and for any number
+of copies, and (iv) for any purpose whatsoever, including without
+limitation commercial, advertising or promotional purposes (the
+"License"). The License shall be deemed effective as of the date CC0 was
+applied by Affirmer to the Work. Should any part of the License for any
+reason be judged legally invalid or ineffective under applicable law, such
+partial invalidity or ineffectiveness shall not invalidate the remainder
+of the License, and in such case Affirmer hereby affirms that he or she
+will not (i) exercise any of his or her remaining Copyright and Related
+Rights in the Work or (ii) assert any associated claims and causes of
+action with respect to the Work, in either case contrary to Affirmer's
+express Statement of Purpose.
+
+4. Limitations and Disclaimers.
+
+ a. No trademark or patent rights held by Affirmer are waived, abandoned,
+ surrendered, licensed or otherwise affected by this document.
+ b. Affirmer offers the Work as-is and makes no representations or
+ warranties of any kind concerning the Work, express, implied,
+ statutory or otherwise, including without limitation warranties of
+ title, merchantability, fitness for a particular purpose, non
+ infringement, or the absence of latent or other defects, accuracy, or
+ the present or absence of errors, whether or not discoverable, all to
+ the greatest extent permissible under applicable law.
+ c. Affirmer disclaims responsibility for clearing rights of other persons
+ that may apply to the Work or any use thereof, including without
+ limitation any person's Copyright and Related Rights in the Work.
+ Further, Affirmer disclaims responsibility for obtaining any necessary
+ consents, permissions or other rights required for any use of the
+ Work.
+ d. Affirmer understands and acknowledges that Creative Commons is not a
+ party to this document and has no duty or obligation with respect to
+ this CC0 or use of the Work.
diff --git a/akka-samples/akka-sample-persistence-java-lambda/LICENSE b/akka-samples/akka-sample-persistence-java-lambda/LICENSE
new file mode 100644
index 00000000000..287f8dd7fa7
--- /dev/null
+++ b/akka-samples/akka-sample-persistence-java-lambda/LICENSE
@@ -0,0 +1,10 @@
+Activator Template by Typesafe
+
+Licensed under Public Domain (CC0)
+
+To the extent possible under law, the person who associated CC0 with
+this Activator Tempate has waived all copyright and related or neighboring
+rights to this Activator Template.
+
+You should have received a copy of the CC0 legalcode along with this
+work. If not, see .
diff --git a/akka-samples/akka-sample-persistence-java-lambda/tutorial/index.html b/akka-samples/akka-sample-persistence-java-lambda/tutorial/index.html
new file mode 100644
index 00000000000..4a1ee727d3a
--- /dev/null
+++ b/akka-samples/akka-sample-persistence-java-lambda/tutorial/index.html
@@ -0,0 +1,137 @@
+
+
+Akka Persistence Samples in Java with Lambdas
+
+
+
+
+
+
Akka Persistence Samples
+
+This tutorial contains examples that illustrate a subset of
+Akka Persistence features.
+
+
+- Processors and channels
+- Processsor snapshots
+- Eventsourced processors
+- Processor failure handling
+- Processor views
+- Processor conversation recovery
+
+
+
+Custom storage locations for the journal and snapshots can be defined in
+application.conf.
+
+
+
Processors and channels
+
+ProcessorChannelExample.java
+defines an ExampleProcessor and an ExampleDestination. The processor sends messages to a
+destination via a channel. The destination confirms the delivery of these messages so that replayed messages aren't
+redundantly delivered to the destination. Repeated runs of the application demonstrates that the processor receives
+both replayed and new messages whereas the channel only receives new messages, sent by the application. The processor
+also receives replies from the destination, demonstrating that a channel preserves sender references.
+
+
+
+To run this example, go to the Run tab, and run the application main class
+sample.persistence.ProcessorChannelExample several times.
+
+
+
Processor snapshots
+
+SnapshotExample.java
+demonstrates how processors can take snapshots of application state and recover from previously stored snapshots.
+Snapshots are offered to processors at the beginning of recovery, before any messages (younger than the snapshot)
+are replayed.
+
+
+
+To run this example, go to the Run tab, and run the application main class
+sample.persistence.SnapshotExample several times. With every run, the state offered by the
+most recent snapshot is printed to stdout, followed by the updated state after sending new persistent
+messages to the processor.
+
+
+
Eventsourced processors
+
+EventsourcedExample.java
+is described in detail in the Event sourcing
+section of the user documentation. With every application run, the ExampleProcessor is recovered from
+events stored in previous application runs, processes new commands, stores new events and snapshots and prints the
+current processor state to stdout.
+
+
+
+To run this example, go to the Run tab, and run the application main class
+sample.persistence.EventsourcedExample several times.
+
+
+
Processor failure handling
+
+ProcessorFailureExample.java
+shows how a processor can delete persistent messages from the journal if they threw an exception. Throwing an exception
+restarts the processor and replays messages. In order to prevent that the message that caused the exception is replayed,
+it is marked as deleted in the journal (during invocation of preRestart). This is a common pattern in
+command-sourcing to compensate write-ahead logging of messages.
+
+
+
+To run this example, go to the Run tab, and run the application main class
+sample.persistence.ProcessorFailureExample several times.
+
+
+
+Event sourcing
+on the other hand, does not persist commands directly but rather events that have been derived from received commands
+(not shown here). These events are known to be successfully applicable to current processor state i.e. there's
+no need for deleting them from the journal. Event sourced processors usually have a lower throughput than command
+sourced processors, as the maximum size of a write batch is limited by the number of persisted events per received
+command.
+
+
+
Processor views
+
+ViewExample.java demonstrates
+how a view (ExampleView) is updated with the persistent message stream of a processor
+(ExampleProcessor). Messages sent to the processor are read from stdin. Views also support
+snapshotting and can be used in combination with channels in the same way as processors.
+
+
+
+To run this example, go to the Run tab, and run the application main class
+sample.persistence.ViewExample.
+
+
+
+Views can also receive events that have been persisted by event sourced processors (not shown).
+
+
+
Processor conversation recovery
+
+ConversationRecoveryExample.java
+defines two processors that send messages to each other via channels. The reliable delivery properties of channels,
+in combination with processors, allow these processors to automatically resume their conversation after a JVM crash.
+
+
+To run this example, go to the Run tab, and run the application main class
+sample.persistence.ConversationRecoveryExample several times.
+
+