Commenting out project.properties so that developers can get it.
Fixed a bug where diconnecting from Notifications was not showing a disconnect in the app
also made sure the lockscreen is gone after a disconnect
Update README.md
Making sure that not having an image for a media won't cause any issues
Improved lock screen RCC behavior when connection is dropped.
Update README.md

Updated Google Play Services version
Update README.md
Fixed a bug where multiple GoogleApiClient.ConnectionCallbacks were being registered upon treatment of transient disconnect
Making sure RCC is closed when we reach the end of a media. Also, when we unlock and land on the VideoCastControllerActivity and media is finished, we want to close the activity
Fixing a bug caused by earlier checkin: wifi reconnection should work now
Merge branch 'master' of https://github.com/googlecast/CastCompanionLibrary-android
some space and line wrapping adjustments
Removing logic to handle long wifi reconnection
updating import order
Cleaning up data channel
some minor changes to the documentation, most notably removing the need for permissions in the manifest
Made sure that when a movie reaches the end, the status on the Router Controller Dialog is updated accordingly
Merge branch 'master' of https://github.com/googlecast/CastCompanionLibrary-android

# By Ali Naddaf (10) and others
# Via Ali Naddaf (1) and anaddaf (1)
* 'master' of https://github.com/googlecast/CastCompanionLibrary-android:
  Made sure that when a movie reaches the end, the status on the Router Controller Dialog is updated accordingly
  some minor changes to the documentation, most notably removing the need for permissions in the manifest
  Cleaning up data channel
  updating import order
  Removing logic to handle long wifi reconnection
  some space and line wrapping adjustments
  Fixing a bug caused by earlier checkin: wifi reconnection should work now
  Making sure RCC is closed when we reach the end of a media. Also, when we unlock and land on the VideoCastControllerActivity and media is finished, we want to close the activity
  Fixed a bug where multiple GoogleApiClient.ConnectionCallbacks were being registered upon treatment of transient disconnect
  Update README.md
  Update README.md
  Improved lock screen RCC behavior when connection is dropped.
  Making sure that not having an image for a media won't cause any issues
  Update README.md
  Fixed a bug where diconnecting from Notifications was not showing a disconnect in the app also made sure the lockscreen is gone after a disconnect
  Commenting out project.properties so that developers can get it.

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