Again... egit sucks
Merge branch 'master' of https://github.com/PPWA/textsearchapp.git

Conflicts:
	BreakingNews/public/javascripts/index.js