add nginx.conf.erb override support for gzip
 - add gzip file type of css javascript and more
Merge remote-tracking branch 'origin/master'

Conflicts:
	config/nginx.conf.erb