translate meal name for order
add dishes on meal.show
1. add material for dish.show
2. more translate
fix translation for login
before change a to link_to
before nested form part 2
add dynamic adding burden, before debug
fix java script grammar issue
patch add burdens
sort Chinese
more translations
Merge branch 'master' of https://github.com/shirui/restaurant

Conflicts:
	app/assets/javascripts/application.js
	app/controllers/dishes_controller.rb
	app/views/dishes/_form.html.erb
	app/views/dishes/show.html.erb
	app/views/layouts/application.html.erb
	nbproject/private/private.xml
	nbproject/private/rake-d.txt