Fixes to UI-Tests and CCScrollView
Merge pull request #339 from vlidholt/ui

Fixes to UI-Tests and CCScrollView