Updated feature: Added Apache config
Fixed issue: Prepared branch after conflicts for pull
Fixed issue: Added configs after conflict