fixed problem in SOCP interface
fix conflict
Merge branch 'master' of https://github.com/IainNZ/Mosek.jl