Makes new ViewModels consistent (uncommitted change from before Max made his fix)
Merge branch 'master' of https://github.com/joshdegagne/Avalanche.git