Prediction
Merge branch 'master' of https://github.com/bdrighes/webmining2013

Conflicts:
	learning/service/prodbox.py