Added Apache2 proxying of webapp.
Merge branch 'apache-proxy' into devel
Merge branch 'devel'