View fixed
Merge branch 'development' of github.com:Treize37/convergences into development