Merge remote-tracking branch 'upstream/master' into hotfix

# Conflicts:
#	application.properties

.gitignore

@@ -1,7 +1,15 @@
-.slcache
-
-out
-*.iml
-target
+Thumbs.db
+.DS_Store
+.gradle
+build/
+target/
 .idea
-
+*.iml
+*.ipr
+*.iws
+.project
+.settings
+.classpath
+.slcache
+/logs/
+out/

.travis.yml

@@ -1,23 +1,25 @@
+dist: trusty
 language: groovy
 jdk:
-- oraclejdk7
+- oraclejdk8
 sudo: false
 branches:
   only:
   - master
-  - hotfix
-before_install:
-- wget -q https://raw.githubusercontent.com/AtlasOfLivingAustralia/travis-build-configuration/master/ala_common.sh
-- chmod +x ala_common.sh
-- source ./ala_common.sh
+  - develop
+  - 1.4.2.1
+before_cache:
+  - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
+  - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
 
-- ala_travis_grails_setup_env
-
-script:
-- ala_travis_grails_test
+cache:
+  directories:
+  - $HOME/.m2
+  - $HOME/.gradle/caches/
+  - $HOME/.gradle/wrapper/
 
 after_success:
-- ala_travis_grails_deploy
+  - '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && travis_retry ./gradlew publish'
 
 env:
   global: