re-factor test cases
Merge branch 'master' of https://github.com/angeltsvetkov/cs-sikuli

Conflicts:
	cs-sikuli/cs-sikuli.v12.suo