Last changes for presentation
Merge branch 'master' of https://github.com/PPWA/textsearchapp.git

Conflicts:
	BreakingNews/app/controllers/analysis/Algorithm.java