started thinking about searching for programmes
Merge remote-tracking branch 'origin/master'

Conflicts:
	avp-core/src/uk/co/rossbeazley/avp/android/search/SearchService.java
MediaRepositry stub
MediaRepositry stub