main animation functionality complete with detail view rollback
Merge branch 'master' into as-views
merge master into as-views
Merge pull request #42 from wh1tney/temp-as-views

Temp as views