Prototype minus photos
Merge branch 'master' into dev