Playing with a new translation menu in nav

It's a start
Nav changes
Hard coding language names (they shouldn't be translated)
Small json file indentation fix
Merge branch 'master' into language_swticher
Preserve route on language switch
Merge branch 'master' into language_switcher

Conflicts:
	app/lib/en.coffee
Correct word for 'Manadarin' 國語

Apparently the previous word may be politically more sensitive.
Updated word for Mandarin

Takes into account that we'll be using both character sets soon.
Error fix for translate.rb and new language templates

Getting lots of language queries now :)
Start of simplified-character chinese translation
Update zh.json

Fixing the word for 'language' to 其他語言
Modify text
Add www so Safari doesn't reload page
CANDLES is done
Update survey ratios
Beta version of simplified Chinese
New simplified Chinese file

(Already on S3)
removing ferengi galaxies
Merge remote-tracking branch 'upstream/master'