update SCS.jl due to changes in SCS
Merge branch 'master' into dev

Conflicts:
	deps/build.jl
	deps/make-dylib.patch
	src/SCS_types.jl
	src/high_level_wrapper.jl
	src/low_level_wrapper.jl