delete apache files
Merge branch 'version-2.0'