hh
Merge remote-tracking branch 'origin/master'

Conflicts:
	buildings.py
	main.py
Events, building complite for colonies