added SCS matlab back, refactor some basic methods
Merge branch 'master' into dense

Conflicts:
	examples/matlab/randomConeProb.m