Added info about Apache.
Merge branch 'master' into develop
Clean up the real code i missed earlier.