Still working on pictures and sync.
Merge remote-tracking branch 'origin/master'
Lucien page upgrades.