Progress in Analysis.
Merge remote-tracking branch 'origin/master'

Conflicts:
	BreakingNews/app/controllers/preparation/Preparation.java