Merge remote-tracking branch 'origin/flowpool-update' into flowpool-update

# Conflicts:
#	config.py
#	pool_predict.py
#	videos_filter.py