Added infinitve and gerund verbs to dictionary and to translation
Fixed merge conflicts