VM test mac
Merge remote-tracking branch 'origin/master'

Conflicts:
	woodpecker.properties
test intellij 13 mac