Updated gitignore

.gitignore

@@ -1,11 +1,87 @@
-/bin/
-.classpath
-.project
-/.settings/
+ # Git
+*.orig
+!.gitignore
+/.settings/        
+ 
+ # Windows
+Thumbs.db
+ehthumbs.db
+ehthumbs_vista.db
+*.stackdump
+[Dd]esktop.ini
+$RECYCLE.BIN/
+*.lnk
+
+ # Linux
+*~
+.fuse_hidden*
+.directory
+.Trash-*
+.nfs*
+
+ # MacOS
+.DS_Store
+.AppleDouble
+.LSOverride
+._*
+
+ # Java
+*.class
+*.log
+*.ctxt
+.mtj.tmp/
+*.jar
+*.war
+*.nar
+*.ear
+hs_err_pid*
+
+ # Maven
+target/
+pom.xml.tag
+pom.xml.releaseBackup
+pom.xml.versionsBackup
+pom.xml.next
+release.properties
+dependency-reduced-pom.xml
+buildNumber.properties
+
+ # Intellij
 *.iml
-/target
-/.DS_Store
-/.idea
-/database/
-/.gitignore
-/dependency-reduced-pom.xml
+*.java___jb_tmp___
+.idea/*
+*.ipr
+*.iws
+/out/
+.idea_modules/
+
+ # Eclipse
+*.pydevproject
+.metadata
+.gradle
+bin/
+tmp/
+*.tmp
+*.bak
+*.swp
+*~.nib
+local.properties
+.settings/
+.loadpath
+.project
+.externalToolBuilders/
+*.launch
+.cproject
+.classpath
+.buildpath
+.target
+
+ # NetBeans
+nbproject/private/
+build/
+nbbuild/
+dist/
+nbdist/
+nbactions.xml
+nb-configuration.xml
+.nb-gradle/