full transitions now need back button to reverse
Merge branch 'master' into as-views
Merging master into transition for view
Merge pull request #38 from wh1tney/as-views

+1
Merge branch 'master' into wo-map-markers