Merge branch 'refs/heads/master' into IISService
Service to iis
Merge branch 'refs/heads/master' into IISService
Merge branch 'refs/heads/master' into IISService

Conflicts:
	gcm-client/src/com/google/android/gcm/demo/app/AddTopicActivity.java
Merge branch 'refs/heads/IISService'