Remove version from the AndroidManifest.xml
Merge branch 'v1.30' of https://github.com/MythTV-Clients/MythTV-Android-Frontend into v1.30

 It looks like you may be committing a merge.
 If this is not correct, please remove the file
	.git/MERGE_HEAD
 and try again.

 Please enter the commit message for your changes. Lines starting
 with '#' will be ignored, and an empty message aborts the commit.
 On branch v1.30
 Your branch and 'origin/v1.30' have diverged,
 and have 1 and 1 different commit each, respectively.
   (use "git pull" to merge the remote branch into yours)

 All conflicts fixed but you are still merging.

 Changes to be committed:
	modified:   app/build.gradle
	modified:   app/src/main/java/org/mythtv/client/ui/BackendStatusFragment.java
	modified:   app/src/main/java/org/mythtv/client/ui/dvr/EpisodeFragment.java
	modified:   app/src/main/java/org/mythtv/client/ui/dvr/RecordingRuleEditFragment.java
	modified:   app/src/main/java/org/mythtv/client/ui/preferences/LocationProfileEditor.java
	modified:   app/src/main/java/org/mythtv/db/dvr/RemoveStreamTask.java
	modified:   app/src/main/java/org/mythtv/service/channel/ChannelDownloadService.java
	modified:   app/src/main/java/org/mythtv/service/channel/v28/ChannelHelperV28.java
	modified:   app/src/main/java/org/mythtv/service/content/GetFileListTask.java
	modified:   app/src/main/java/org/mythtv/service/content/GetLiveStreamTask.java
	modified:   app/src/main/java/org/mythtv/service/content/LiveStreamService.java
	modified:   app/src/main/java/org/mythtv/service/content/v28/FileListHelperV28.java
	modified:   app/src/main/java/org/mythtv/service/content/v28/LiveStreamHelperV28.java
	modified:   app/src/main/java/org/mythtv/service/dvr/RecordedService.java
	modified:   app/src/main/java/org/mythtv/service/dvr/RecordingRuleService.java
	modified:   app/src/main/java/org/mythtv/service/dvr/UpcomingDownloadService.java
	modified:   app/src/main/java/org/mythtv/service/dvr/v28/ProgramHelperV28.java
	modified:   app/src/main/java/org/mythtv/service/dvr/v28/RecordedHelperV28.java
	modified:   app/src/main/java/org/mythtv/service/dvr/v28/RecordingHelperV28.java
	modified:   app/src/main/java/org/mythtv/service/dvr/v28/RecordingRuleHelperV28.java
	modified:   app/src/main/java/org/mythtv/service/dvr/v28/UpcomingHelperV28.java
	modified:   app/src/main/java/org/mythtv/service/frontends/GetFrontendActionListTask.java
	modified:   app/src/main/java/org/mythtv/service/frontends/GetStatusTask.java
	modified:   app/src/main/java/org/mythtv/service/frontends/PlayRecordingOnFrontEndTask.java
	modified:   app/src/main/java/org/mythtv/service/frontends/SendActionTask.java
	modified:   app/src/main/java/org/mythtv/service/frontends/SendMessageTask.java
	modified:   app/src/main/java/org/mythtv/service/frontends/v28/StatusHelperV28.java
	modified:   app/src/main/java/org/mythtv/service/guide/ProgramGuideDownloadService.java
	modified:   app/src/main/java/org/mythtv/service/guide/v28/ProgramGuideHelperV28.java
	modified:   app/src/main/java/org/mythtv/service/myth/CreateStorageGroupTask.java
	modified:   app/src/main/java/org/mythtv/service/myth/GetHostnameTask.java
	modified:   app/src/main/java/org/mythtv/service/myth/GetHostsTask.java
	modified:   app/src/main/java/org/mythtv/service/myth/GetSettingTask.java
	modified:   app/src/main/java/org/mythtv/service/myth/GetStorageGroupsTask.java
	modified:   app/src/main/java/org/mythtv/service/myth/v28/HostHelperV28.java
	modified:   app/src/main/java/org/mythtv/service/myth/v28/SettingHelperV28.java
	modified:   app/src/main/java/org/mythtv/service/myth/v28/StorageGroupHelperV28.java
	modified:   app/src/main/java/org/mythtv/service/status/BackendStatusService.java
	modified:   app/src/main/java/org/mythtv/service/status/v28/BackendStatusHelperV28.java