add apache mod to dev
Merge branch 'dev' into production