adding locales
default route
Merge remote-tracking branch 'origin/ld_follow'

Conflicts:
	config/routes.rb