diff --git a/.travis.yml b/.travis.yml
index 9c69ea1d..bf44be55 100755
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,4 +13,33 @@ script:
 branches:
   only:
     - master
-    - dev
+language:
+  - java
+jdk:
+  - openjdk6
+before_install:
+  # environment info
+  - mvn -version
+  - gradle -v
+  - uname -a
+  # required libs for android build tools
+  - if [ `uname -m` = x86_64 ]; then sudo apt-get update; fi
+  - if [ `uname -m` = x86_64 ]; then sudo apt-get install -qq --force-yes libgd2-xpm ia32-libs ia32-libs-multiarch; fi
+  # for gradle output style
+  - export TERM=dumb
+  # newer version of gradle
+  - wget http://services.gradle.org/distributions/gradle-1.11-bin.zip
+  - unzip -qq gradle-1.11-bin.zip
+  - export GRADLE_HOME=$PWD/gradle-1.11
+  - export PATH=$GRADLE_HOME/bin:$PATH
+  # just to test gradle version, against our provided one
+  - gradle -v
+  # newest android SDK 22.6.1
+  - wget http://dl.google.com/android/android-sdk_r22.6.1-linux.tgz
+  - tar -zxf android-sdk_r22.6.1-linux.tgz
+  - export ANDROID_HOME=`pwd`/android-sdk-linux
+  - export PATH=${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools
+  # manually set sdk.dir variable, according to local paths
+  - echo "sdk.dir=$ANDROID_HOME" > local.properties
+  - echo yes | android update sdk -a -t tools,platform-tools,extra-android-support,extra-android-m2repository,android-19,build-tools-19.0.3 --force --no-ui
+>>>>>>> Fixed Gradle(w) build and Travis errors
diff --git a/library/src/main/java/uk/co/senab/photoview/IPhotoView.java b/library/src/main/java/uk/co/senab/photoview/IPhotoView.java
index b316d907..b36b2135 100755
--- a/library/src/main/java/uk/co/senab/photoview/IPhotoView.java
+++ b/library/src/main/java/uk/co/senab/photoview/IPhotoView.java
@@ -116,7 +116,6 @@ public interface IPhotoView {
 
     /**
      * Return the current scale type in use by the ImageView.
-     *      *
      *
      * @return current ImageView.ScaleType
      */
diff --git a/sample/src/main/res/menu/viewpager_menu.xml b/sample/src/main/res/menu/viewpager_menu.xml
index daa11835..b6b7429c 100644
--- a/sample/src/main/res/menu/viewpager_menu.xml
+++ b/sample/src/main/res/menu/viewpager_menu.xml
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<menu xmlns:tools="http://schemas.android.com/tools"
-      xmlns:android="http://schemas.android.com/apk/res/android" >
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
 
     <item
         android:id="@+id/menu_lock"
         android:showAsAction="always"
-        android:title="@string/menu_lock"
-        tools:ignore="UnusedAttribute"/>
+        android:title="@string/menu_lock"/>
 
-</menu>
\ No newline at end of file
+</menu>