extracted a StateMachine for player scrubbing, not sure its actually better!!
Merge remote-tracking branch 'origin/master'

Conflicts:
	avp-core/test/unit/src/uk/co/rossbeazley/avp/android/player/control/MediaPlayerScrubbingTest.java
merged from trunk