Merge remote-tracking branch 'square/master' into robolectric-2-better-libs

* square/master:
  Return a spannable if you set spans on TextViews

Conflicts:
	src/main/java/com/xtremelabs/robolectric/shadows/ShadowTextView.java
Remap library R class numbers to unique ranges.