Search Instagram and Twitter directly, instead of Mass Relevance
Merge branch 'master' of github.com:kerrywall/conclave13

Conflicts:
	js/temp3.js