html geändert, javascript auslesen und css geändert
Merge branch 'master' of https://github.com/PPWA/textsearchapp.git

Conflicts:
	BreakingNews/app/controllers/preparation/Preparation.java
	BreakingNews/index/_0.cfs
	BreakingNews/index/segments.gen
	BreakingNews/public/javascripts/EBJavaScript.js
	BreakingNews/public/stylesheets/main.css