Merge branch 'master' of github.com:Requarks/wiki

dev/openshift/Dockerfile

@@ -0,0 +1,8 @@
+FROM requarks/wiki:beta
+
+USER root
+
+RUN chgrp -R 0 /wiki /logs && \
+    chmod -R g=u /wiki /logs
+
+USER 1001