Revert "Merge remote-tracking branch 'opencv/master'"

This reverts commit d12265dd7c28fef5424e00ba654e2692773721ae, reversing
changes made to b2b8a8b197123cbde7141b694586fb0e1775d19f.
Revert "Merge pull request #659 from Nerei:master"

This reverts commit 7772811585dbc92fca180cd748b5e38a44c45859, reversing
changes made to 92ba74a3ee9a7364921e0ac7764a5b653241eeec.

Conflicts:
	modules/softcascade/src/cuda/channels.cu
	modules/softcascade/src/cuda_invoker.hpp