Changes to media tag query
Merge branch 'master' into npex_media_tags

Conflicts:
	src/info/guardianproject/securereader/DatabaseAdapter.java