Merge branch 'ide-1.5.x' into can

Author: cmaglie

.gitignore

@@ -13,7 +13,6 @@ hardware/arduino/bootloaders/caterina_LUFA/Caterina.lss
 hardware/arduino/bootloaders/caterina_LUFA/Caterina.elf
 hardware/arduino/bootloaders/caterina_LUFA/Caterina.eep
 hardware/arduino/bootloaders/caterina_LUFA/.dep/
-.gitignore
 build/windows/work/
 build/linux/work/
 build/linux/dist/*.tar.gz

app/build.xml

@@ -76,7 +76,7 @@
       <fileset dir="test" includes="**/*.txt" />
     </copy>
 
-    <junit printsummary="yes" haltonfailure="yes">
+    <junit printsummary="yes">
       <classpath>
         <pathelement location="bin"/>
         <pathelement location="test-bin"/>