scrollview iphone4 bug finished, note finished
Merge remote-tracking branch 'origin/master'