Various bugfixes + cosmetics + started farmfunction
Merge remote-tracking branch 'origin/master'

Conflicts:
	bot/bot.py
	main.py
	settings/buildings.txt