Creating template
Merge branch 'master' of ssh://www-wordkeeper.rhcloud.com/~/git/www into dev

Conflicts:
	project.clj
Made running the server compatible with openshift.
Openshift fix for local-repo.
fixed a typo
fixed another typo
Ugly db configuration for openshift