media search, popular
Merge remote-tracking branch 'origin/master'

Conflicts:
	Instagram.php