Merge with master.
Revert to smaller-footprint demo.
Merge branch 'chuckh-firebase-2.0.x'