test
Merge branch 'master' of heroku.com:gold-experience

Conflicts:
	src/main/webapp/js/search.js
Merge branch 'master' of https://github.com/Soulyyy/TheWorldNews
srch
srch
srch
srch
srch
srch
Merge branch 'master' of https://github.com/Soulyyy/TheWorldNews
search , latest