changes to webapp
changes to webapp
Merge branch 'master' of https://github.com/drfred1981/scm-manager_ynh

Conflicts:
	conf/nginx.conf
	scripts/install