#mg-119 fixed work 1h 30m
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	app/mailers/inquires_mailer.rb