daves changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/MSSE/MobileDVR/fragments/guide/ChannelGuideView.java
	src/com/MSSE/MobileDVR/fragments/recorded/ScheduledRecordingFragment.java
daves changes