Modif to get the simulation to run
Merge branch 'master' of http://github.com/kshmir/ss-2013

Conflicts:
	config/locales/app.es.yml