Revert "Revert "Merge branch 'rekey-android'""

This reverts commit 7352d2b6ecdd0e9e29f4ff155e3e49d2cb1fbed1.

Conflicts:
	lib/importer/android.rb
	lib/localizer/android.rb
	spec/lib/importer/android_spec.rb
Better way of doing this Android rekeying stuff
Spec fix
Fixes style of translation panel
Shows locales for translator/reviewers and project status for monitor/admin on filter-bar
Merge branch 'master' of github.com:square/shuttle

* 'master' of github.com:square/shuttle:
  Spec fix
  Better way of doing this Android rekeying stuff
  Revert "Revert "Merge branch 'rekey-android'""
Escapes leading @ when exporting Android
Fixes exported filter with Elastic Search
Speed up CommitStatsRecalculator
Merge pull request #46 from square/ricksong/exported-fix

Fixes exported filter with Elastic Search
Merge pull request #45 from square/ricksong/android-escape

Escapes leading @ when exporting Android
Merge branch 'master' into ricksong/sorting

* master:
  Speed up CommitStatsRecalculator
  Fixes exported filter with Elastic Search
  Escapes leading @ when exporting Android
  Shows locales for translator/reviewers and project status for monitor/admin on filter-bar
  Fixes style of translation panel
  Spec fix
  Better way of doing this Android rekeying stuff
  Revert "Revert "Merge branch 'rekey-android'""

Conflicts:
	app/views/home/index.slim