Merge remote-tracking branch 'shane-axiom/master'

Alex Leith

2016-03-14 8383a53de200b231b029daadaf0ca9abe7d2b91d

 .gitignore

@@ -1,3 +1,8 @@
resources/geoserver.zip
resources/plugins/*.zip
resources/*
!resources/plugins/
resources/plugins/*
!resources/plugins/README.txt
!resources/overlays/
resources/overlays/*
!resources/overlays/README.txt
.idea