Merge pull request #1 from titoko/master

Merge from upstream
Update nginx.conf
Merge branch 'master' of https://github.com/Kloadut/jappix_ynh

Conflicts:
	conf/nginx.conf