modal info
Merge remote-tracking branch 'origin/master'

Conflicts:
	protected/modules/ratefuel/views/default/weather.php
weather