Merge branch 'travis' of https://github.com/gabrielemariotti/cardslib …

…into dev2

.travis.yml

@@ -5,12 +5,15 @@ android:
       - build-tools-22.0.1
       # The SDK version used to compile your project
       - android-22
+      # Additional components
+      - extra-android-m2repository
+
 
 
 branches:
   only:
-    - master
-    - dev
+    - travis
+
 
 notifications:
   email: false

demo/extras/src/main/java/it/gmariotti/cardslib/demo/extras/fragment/nativeview/GoogleProgressFragment.java

@@ -78,6 +78,7 @@ public void onActivityCreated(Bundle savedInstanceState) {
      */
     private void initCard() {
 
+
         //Init an array of Cards
         ArrayList<Card> cards = new ArrayList<Card>();
         for (int i = 0; i < 20; i++) {

demo/extras/src/main/res/layout/carddemo_native_googleprogress.xml

@@ -25,13 +25,14 @@
               android:layout_width="match_parent"
               android:layout_height="match_parent">
 
+    <!--
     <com.jpardogo.android.googleprogressbar.library.GoogleProgressBar
         android:id="@+id/google_progress"
         android:layout_width="50dp"
         android:layout_height="50dp"
         android:layout_gravity="center"
         gpb:type="nexus_rotation_cross"/>
-
+-->
 
     <TextView
         android:layout_width="wrap_content"