fixed some minor bugs in ios

more ios6 bugs need attention
Merge remote-tracking branch 'origin/master'