Merge pull request #2595 from iglesias/develop

Class name fix in SGObject impl.
Update OpenCV_NN_vs_Shogun_NN.md
Removed deprecated register in Trie and Math swap
Remove outdated comment due to previous commit and all register hints in CMath header.