Moving to version v1.1, refer to changelist for changes
Fixing a regression and a couple of typos
Merge branch 'master' of https://github.com/googlecast/CastCompanionLibrary-android

# By Ali Naddaf (1) and anaddaf (1)
# Via anaddaf
* 'master' of https://github.com/googlecast/CastCompanionLibrary-android:
  Fixing a regression and a couple of typos
  Moving to version v1.1, refer to changelist for changes

Conflicts:
	src/com/google/sample/castcompanionlibrary/cast/player/VideoCastControllerActivity.java