Update PushSample and RichPushSample to use channels. Update copyright date.
Removed copyright changes to reduce merge conflicts.
Merge remote-tracking branch 'origin/channels' into MB-141
Update project.properties
Merge remote-tracking branch 'origin/channels' into MB-141

Conflicts:
	RichPushSample/project.properties
Merge pull request #62 from urbanairship/MB-141

MB-141: Update samples with channels
Updating samples to gradle 0.9.+
Remove old location sample
Update samples to use new location
Merge branch 'next' into channels

Conflicts:
	PushSample/src/com/urbanairship/push/sample/IntentReceiver.java
	PushSample/src/com/urbanairship/push/sample/MainActivity.java
Update pending result.
Update PushSample to use Google Play services.
Update RichPush sample with Google Play services.
Remove custom preferences button
Update README.rst
Update README.rst
Merge pull request #85 from urbanairship/MB-307

MB-307: Update samples to use Google Play services
Merge pull request #84 from urbanairship/MB-302

MB-302: Update samples to latest location
Merge pull request #86 from urbanairship/MB-2

MB-2: Google Play services
Merge remote-tracking branch 'origin/next' into channels

Conflicts:
	PushSample/res/values/strings.xml
	PushSample/src/com/urbanairship/push/sample/MainActivity.java
	PushSample/src/com/urbanairship/push/sample/preference/CustomPreferencesActivity.java