Merge pull request #80 from strikegun/master

Add translations for Tantive IV expansion pack
Add updated ship translation for CR90 pilots
Updated French and English wave 5 translations based on hints from Edge Entertainement's website.
Fixed typos in French translation.
Fixed French translation bug with PS3 YT2400 Pilot.
Shorter upgrade placeholder so that the whole placeholder can be seen on small screens.
Merge pull request #83 from pejuaxel/master

French typos + Wave 5 update
Fix bug where pilots and modifications didn't show in browser.
Reveal of last named B-Wing in Rebel Aces.
Unofficial French translation for Nera Dantels.
Merge pull request #85 from pejuaxel/master

Unofficial French translation for Nera Dantels.
Correctly serialize addons conferred by modifications.

fixes #86
Fix typo.
Official French translation of Rebels Aces from http://www.atelierdufaucon.com/2014/07/toutes-les-cartes-des-as-rebelles.html#comment-form
Merge pull request #87 from pejuaxel/master

Official French translation of Rebels Aces
Merge branch 'master' of github.com:geordanr/xwing

Conflicts:
	index.html
	privacy.html
Fix bug where R2D2 could not be selected as an Astromech in French.
Merge pull request #88 from pejuaxel/master

Fix bug where R2D2 could not be selected as an Astromech in French.
Stay On Target revealed.
Stay on target card text.