Merge remote-tracking branch 'origin/master'

.gitignore

@@ -4,6 +4,7 @@
 /src/postscripts/plugins/*
 /data/*
 /etc/*
+!/etc/template/
 /var/*
 /var/tmp/*
 

etc/template/project.json

@@ -0,0 +1,5 @@
+{
+  "project": {
+    "cryptkey": null
+  }
+}

etc/template/project_manager.json

@@ -0,0 +1,7 @@
+{
+  "project_manager": {
+    "workspaces_dir": "",
+    "apache_httpdocs": "",
+    "projects": {}
+  }
+}