update nav_li, support link options
show price
number_to_currency
install rails-i18n
add locale
update assets
Merge branch 'master' into cart

Conflicts:
	app/views/layouts/_navbar.html.erb