Applied some changes as per @rkuhn's pull request.
Alternative with @Configurable
Merge commit '955530274c5a2720cca4a9cdf46492f6ab96dc96' into aop-actor-system-bean

Conflicts:
	src/main/scala/org/typesafe/Akkaspring.scala
Re-factored Patrik's changes into existing files in order to keep the example as simple as possible.