Merge pull request #969 from ngodfraind/master

Fixing converters.
Upgrade file.
Angular as dep in Upgrade