Update feature slides
Update "features" slide
Cleanup. End version prototype
Merge master