Added code to ShadowObjectAnimator to detect when "cancel()" gets called.
Merge branch 'master' of https://github.com/pivotal/robolectric

Conflicts:
	src/main/java/com/xtremelabs/robolectric/Robolectric.java
Implement View.setScrollX() and View.setScrollY()
Merge branch 'master' of git://github.com/pivotal/robolectric into robo-staging