Merge branch 'master' into feature/stabilization
es-ES injection on 20140628-004908
cs injection on 20140701-005047
CAL-916 Add more instances after edit following recurring event
vi injection on 20140705-005121
CAL-915 Activity of exception event is deleted after delete recurring events
Merge branch 'feature/stabilization'