merged master

Signed-off-by: asharani-murugesh <asharani.murugesh@in.bosch.com>
2016-03-04 19:01:37 +01:00
parent f2fe6270f1 48906bdea8
commit 578bd66b28
50 changed files with 2102 additions and 1505 deletions
--- a/pom.xml
+++ b/pom.xml
@@ -382,6 +382,11 @@
            <artifactId>vaadin-push</artifactId>
            <version>${vaadin.version}</version>
         </dependency>
+         <dependency>
+            <groupId>com.vaadin</groupId>
+            <artifactId>vaadin-client</artifactId>
+            <version>${vaadin.version}</version>
+         </dependency>
         <dependency>
            <groupId>com.vaadin</groupId>
            <artifactId>vaadin-themes</artifactId>