Updated ScrollView performance test to remove incompatabilities with YUI Benchmark
Added performance.json file for white-listing perf test source files
Merge branch 'master' into dev-master