cambios e n el form
Merge branch 'master' of github.com:kshmir/ss-2013

Conflicts:
	app/views/home/_simulation_form.html.haml