digital: removed superfluous fftshift
digital: cleaned out debugging blocks
docs: Adding gr-uhd to sphinx docs.
sphinx docs: Added additional block function names to blacklist so that they are not displayed for every block.
Merge branch 'maint'
Merge remote-tracking branch 'martin/master-cleanup'
Merge branch 'master' into next

Conflicts:
	gr-digital/include/digital/CMakeLists.txt
	gr-digital/lib/CMakeLists.txt
	gr-digital/lib/scale_tags_impl.cc
	gr-digital/lib/tagged_stream_check_impl.cc
	gr-digital/lib/ts_insert_zeros_cc_impl.cc
	gr-digital/python/qa_scale_tags.py
	gr-digital/python/qa_ts_insert_zeros.py
	gr-digital/swig/digital_swig.i
core: fix typo in logger header file
core: add missing include dir
volk: fixed MSVC include directory
Merge branch 'master' into next
Merge remote-tracking branch 'ncorgan/volk_msvc_fix' into maint
Merge branch 'maint'
cmake: fix warnings regarding #defines
Merge branch 'master' into next

Conflicts:
	config.h.in
core: fix use of inaccesible methods in pycallback