removed ember portion to animaltrax-ui repo; not yet tested
Merge remote-tracking branch 'origin/master'