Merge branch 'master' of https://github.com/pwm-project/pwm

.gitignore

@@ -1,6 +1,5 @@
 /.idea
-/pwm.iml
 /client/target
-/client/pwm-client.iml
 /client/.node
 /client/.idea
+*.iml

server/pom.xml

@@ -59,7 +59,7 @@
         </profile>
         <profile>
             <!-- Builds a zip file containing the built war file, along with the supplemental directory -->
-            <id>release-bundle</id>
+            <id>release</id>
             <build>
                 <plugins>
                     <plugin>