Merge remote-tracking branch 'intel/master'

Change-Id: I9e826198b9415d27f87bb21af59ae04dd90cf0f2
diff --git a/.gitignore b/.gitignore
index 26007a2..d18ef4b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,6 +33,10 @@
 # Netbeans specific project files
 nbactions.xml
 
+# IntelliJ specific project files
+.idea
+*.imlnbactions.xml
+
 # generated files
 bin/
 gen/