stash
Merge branch 'master' of https://github.com/scienceopen/cv-aurora

Conflicts:
	RunGenOFtestPattern.m

merging