Fix some small recording issues
Merge branch 'feature/KingOfBrian/idleState'

Conflicts:
	FRY/Categories/UIView+FRY.m
Added code to track scrolling state in UIScrollView
Merge branch 'master' into feature/KingOfBrian/scrollview