Merge branch 'master' of gnuradio.org:gnuradio
Merge branch 'master' into next
atsc: installing all gr-atsc headers in gnuradio/atsc.
Squash/rebased martin/ofdm-master onto trial merge branch

Conflicts:
	gr-blocks/include/blocks/CMakeLists.txt
digital: fix QA tests for pmt import
analog: minor cleanup for added block
blocks: minor cleanup of added blocks
digital: fixed tagged_stream_mux xml and example GRC app
blocks: adding correct link flags for log4cpp
core: adding default empty tags list argument to vector_source_x.set_data() function to unbreak old calls
blocks: moving copy, endian_swap, head, skiphead, vector_source/sink/insert to gr-blocks.
blocks: moved nop, null source/sink, copy, vector_map to gr-blocks.
blocks: changing vector_insert category location.
digital: pimplified old blocks
modtool: added tagged_stream block as an option
Merge branch 'master' of gnuradio.org:gnuradio
Merge branch 'master' into next

Conflicts:
	gr-blocks/swig/blocks_swig.i
blocks: converting references to vector source/sink, null source/sink, nop, copy, head, skiphead, vector_map, and annotator blocks to use gr-blocks.
blocks: moved ctrlport_probes to gr-blocks. Removed from gnuradio-core.
core: removing blocks: align_on_samplenumbers, check_counting_s, fake_channel_coder, iqcomp, ofdm_bpsk_demapper, ofdm_frame_sink, pa_2x2_phase_combiner.