Merge remote-tracking branch 'origin/master'

.gitignore

@@ -4,6 +4,7 @@
 *.class
 # Mobile Tools for Java (J2ME)
 .mtj.tmp/
+.idea/
 /nbproject
 *.ipr
 *.iws