Merge branch 'master' into feature/stabilization
fr injection on 20140617-005111
CAL-960, CAL-961 Incorrect confirmation message when edit/delete recurring event
CAL-721 [Share Calendar] Concatenate the resource bundle keys for translation purpose
en injection on 20140619-005016
fr injection on 20140619-005016
vi injection on 20140619-005016
ar injection on 20140619-005016
ja injection on 20140619-005016
de injection on 20140619-005016
sv-SE injection on 20140619-005016
it injection on 20140619-005016
pt-BR injection on 20140619-005016
es-ES injection on 20140619-005016
ru injection on 20140619-005016
tr injection on 20140619-005016
zh-CN injection on 20140619-005016
sq injection on 20140619-005016
zh-TW injection on 20140619-005016
cs injection on 20140619-005016