Merge remote-tracking branch 'origin/master'

Conflicts:
	src/org/osmacro/bot/Bot.java