Moved apache config files to apache directory and changed README.md to reflect it
Merge branch 'master' into robot