build
Merge branch 'master' of https://github.com/socialSearch/socialSearch

Conflicts:
	server/api/search/Stubs.js
	server/api/search/twitter.js
	server/api/search/twitter.spec.js
add log to twitter.js