Merge pull request #364 from wgerlach/master

make docker an option in the production template