fix redirect loop
Merge branch 'ld_redirect_fix'

Conflicts:
	app/controllers/application_controller.rb
	log/localeapp.yml