prepare for merge
Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/webdamsystem/webdamsystem

Conflicts:
	app/models/scenario.rb
	config/peer/amazon/serge/peer.yml
fixed config file
 Please enter the commit message for your changes. Lines starting
redeploy.sh