fixed merge issues
Merge branch 'Switch-libsvm-to-liblinear'