Moved to nginx, apache running as fallback.
Updated to upstream.
Merge branch 'master' of github.com:zvynar/oberkirch.org