fixed iPad time
Merge remote-tracking branch 'origin/Master' into Master
fixed iPad time and junk