Update ViewModels
almost all
Create Animal Tab
some adds
Merge branch 'software'
merge with software