Refactored the onTouchEvent method and extracted the different cases to their own methods
Added a check for overfling. Fixes some minor issues with scrolling.
Fixes edge scroll issues. Trying to scroll beyond edges is now prevented unless you are in fling mode
Merge branch 'master' into scrolling-fix

Conflicts:
	FreeFlow/src/com/comcast/freeflow/core/FreeFlowContainer.java