added reverse proxy setting, change httpd.conf.erb
Merge remote-tracking branch 'origin/master'