motrr images
no message
added locations
changed some locations
changed locations
added tags to json file
audio and search
Merge branch 'master' into shwetha

Conflicts:
	public/pub-mccosh/img.json