Commit from workspace 35 dir.
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	.project
	.settings/org.eclipse.jdt.core.prefs
	.settings/org.maven.ide.eclipse.prefs
	src/main/java/applicationContext.xml
	src/main/java/org/bellegar/rotator/Bootstrap.java
	src/main/java/org/bellegar/rotator/applescript/AppleScriptCommand.java
	src/main/java/org/bellegar/rotator/applescript/ChangeDesktopCommand.java