Merge Changes of the master repository

2016-10-24 15:32:32 +02:00
parent 20295316c2 19cb715d20
commit 750fa4f954
32 changed files with 1336 additions and 137 deletions
--- a/pom.xml
+++ b/pom.xml
@ -132,8 +132,13 @@
        <module>aggregator-microservices</module>
        <module>promise</module>
        <module>page-object</module>
+<<<<<<< HEAD
        <module>object-mother</module>
    </modules>
+=======
+        <module>event-asynchronous</module>
+	</modules>
+>>>>>>> refs/remotes/iluwatar/master

    <dependencyManagement>
        <dependencies>