Better progression logging
Merge branch 'master' of https://github.com/la-sofia/oi

Conflicts:
	app/models/Search.scala