dev br test
Merge remote-tracking branch 'origin/dev-branch' into dev-branch

Conflicts:
	TVDownloads/src/ie/kehoe/tvdownloads/TVDownloadsDayActivity.java