fi injection on 20131008-040636
fr injection 20131130 and 20131101
Crowdin injections w46 (from 20131112 to 20131115)
Crowdin injection w47 (es-ES injection on 20131116-052112)
Merge remote-tracking branch 'origin/feature/stabilization'
Merge remote-tracking branch 'origin/master' into feature/edit-repetitive-events