web.conf
Merge branch 'master' of https://github.com/EPICPaaS/gopush-cluster

Conflicts:
	web/web.conf