treat options as a struct to avoid possible ambiguities
Merge commit '672516ea2814f7a851ef3c08e96a44c3ad987e14'

Conflicts:
	src/matlab2tikz.m
handle options as cell of size (:,2)