Minor changes on comments and log
Conflict resolution a favore di Carlo
Merge branch 'master' of https://github.com/gluseppe/progaserver

Conflicts:
	prediction.pyc
	predictor.py
	predictor.pyc
	traffic.pyc