Major updates
Merge branch 'master' of https://github.com/VetHeroes/front

* 'master' of https://github.com/VetHeroes/front:
  testing mac
  testing mac