iOS last minute fixes for client meeting
Merge remote-tracking branch 'origin/master'