Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/wfuzz/fuzzqueues.py
#	src/wfuzz/plugins/scripts/links.py
#	src/wfuzz/ui/console/common.py
#	src/wfuzz/ui/console/mvc.py
#	src/wfuzz/wfuzz.py
