per javadoc merge
per javadoc merge
Merge branch 'master' of github.com:sikuli/sikuli-api

Conflicts:
	src/main/java/org/sikuli/api/Relative.java
	src/main/java/org/sikuli/api/visual/Canvas.java
removed deprecated stuff
fixed an example
[maven-release-plugin] prepare release sikuli-api-1.1.0