Update demo app ID, version
A handful of changes...
Update build tools, target SDK
Merge remote-tracking branch 'origin/master' into material