Merge branch 'next' of gnuradio.org:gnuradio into next
Merge branch 'next' of ssh://192.168.2.110/Users/git/gnuradio into next
digital: cleaned out debugging blocks
analog, digital: fixed control_loop-derived blocks to inherit control_loop functions through SWIG.
examples: updating many examples for changes in modules and namespaces.
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
blocks: moved lfsr and friends to gr-blocks.
core: add missing include dir
volk: fixed MSVC include directory
blocks: removing fxpt, nco, vco primitives from gr-blocks.

Have decided to keep all basic math functions in core.
Merge branch 'master' into next
Merge branch 'master' into next
Merge remote-tracking branch 'ncorgan/volk_msvc_fix' into maint
Merge branch 'maint'
Revert "blocks: removed all nco/vco and fxpt stuff from core; now in gr-blocks."

This reverts commit fe70fa72ea22a133874337da2d03d30611e5ab1c.

Conflicts:

	gnuradio-core/src/lib/general/CMakeLists.txt
	gnuradio-core/src/lib/general/general.i
	gnuradio-core/src/tests/CMakeLists.txt