Merge pull request #2 from computer-science-uniovi/development

Update from development to master

Author: thewillyhuman

.gitignore

@@ -1,75 +1,85 @@
-# Directories #
-/build/
-/build
-*/bin/
-/bin/
-target/
-build/
-
-# OS Files #
-.DS_Store
-
-*.class
-
-# Package Files #
-*.jar
-*.war
-*.ear
-*.db
-
-######################
-# Windows
-######################
-
-# Windows image file caches
-Thumbs.db
-
-# Folder config file
-Desktop.ini
-
-######################
-# OSX
-######################
-
-.DS_Store
-.svn
-
-# Thumbnails
-._*
+/target/
 
-# Files that might appear on external disk
-.Spotlight-V100
-.Trashes
-
-
-######################
-# Eclipse
-######################
-
-*.pydevproject
 .metadata
-bin/**
-tmp/**
-tmp/**/*
+bin/
+tmp/
 *.tmp
 *.bak
 *.swp
 *~.nib
 local.properties
-.classpath
 .settings/
 .loadpath
-/src/main/resources/rebel.xml
+.recommenders
+
+# Eclipse Core
+.project
+
 # External tool builders
 .externalToolBuilders/
 
 # Locally stored "Eclipse launch configurations"
 *.launch
 
-# CDT-specific
+# PyDev specific (Python IDE for Eclipse)
+*.pydevproject
+
+# CDT-specific (C/C++ Development Tooling)
 .cproject
 
-# PDT-specific
+# JDT-specific (Eclipse Java Development Tools)
+.classpath
+
+# Java annotation processor (APT)
+.factorypath
+
+# PDT-specific (PHP Development Tools)
 .buildpath
-*/.gradle/
-.gradle/
+
+# sbteclipse plugin
+.target
+
+# Tern plugin
+.tern-project
+
+# TeXlipse plugin
+.texlipse
+
+# STS (Spring Tool Suite)
+.springBeans
+
+# Code Recommenders
+.recommenders/
+
+.DS_Store
+
+# User-specific stuff:
+.idea/**/workspace.xml
+.idea/**/tasks.xml
+
+# Sensitive or high-churn files:
+.idea/**/dataSources/
+.idea/**/dataSources.ids
+.idea/**/dataSources.xml
+.idea/**/dataSources.local.xml
+.idea/**/sqlDataSources.xml
+.idea/**/dynamic.xml
+.idea/**/uiDesigner.xml
+
+# Gradle:
+.idea/**/gradle.xml
+.idea/**/libraries
+
+# Mongo Explorer plugin:
+.idea/**/mongoSettings.xml
+
+## File-based project format:
+*.iws
+
+# IntelliJ
+/out/
+
+
+.idea/
+/.gradle/
+/build/