gasPrices
Merge branch 'master' of github.com:ccavazos/hack-until-it-hertz

Conflicts:
	app/views/gas/gas.xml