corrected wx fft vertical label from amplitude to power
wxgui: use complex_to_mag_squared instead of complex_to_mag in wxgui fftsink_nongl
wxgui: corrected errors in wxgui fftsink_gl sample re-ordering
qtgui: corrected errors in qtgui frequency sink (f and c) sample ordering
Merge branch 'mossmann_qtgui'
Merge branch 'master' into next
added new proto-kernels

Conflicts:
	volk/kernels/volk/volk_32fc_x2_dot_prod_32fc.h
volk: Added proto-kernels for convert, multiply, conjugate, deinterleave, magnitude, mag-square, psd functions.
volk: temp log kernels.
volk: Added log2

volk: Added fast inaccurate exp kernel.
volk: Added avx proto-kernel for fast exp.
volk: expfast comments
volk: added power kernel.
volk: Added sin, cos kernels.
volk: Added tan kernel.
volk: Added atan, asin, acos kernels.
volk (gsoc): whitespace

Conflicts:
	volk/kernels/volk/volk_32fc_x2_dot_prod_32fc.h
volk: fixed some warnings
volk: fixed a problem with acos during some translation in the git history.
volk: adding copyright notice to all volk kernels.

Note I just set these all to 2014, though some kernels are from earlier. We'd need to go through the history to know for certain.