Merged server configs with server version, made differences as minimal as possible between configs and added production config.
Replaced tabs with spaces.
Merge pull request #818 from maykinmedia/bb-1620

Bb 1620