Master synced with couch app

Master up to date with couch application.