See changelist for 1.1 -> 1.2 for a complete list of changes
Merge branch 'master' of https://github.com/googlecast/CastCompanionLibrary-android

Conflicts:
	src/com/google/sample/castcompanionlibrary/cast/BaseCastManager.java
	src/com/google/sample/castcompanionlibrary/cast/dialog/video/VideoMediaRouteControllerDialog.java