Data export
Sync data
iPhone support
Merge remote-tracking branch 'origin/master'