Merge branch 'master' of https://github.com/Caldfir/stonesense
Merge branch 'master' of https://github.com/Caldfir/stonesense
Added ability to pick a color from the pattern

Also changed how the colors are shown in debug mode.
Added ability to chose which of the component items of a building to take the materials from.
Merge branch 'master' of https://github.com/Caldfir/stonesense
Merge branch 'master' of https://github.com/Caldfir/stonesense
Added well bucket capability.
Revert "Fix crash at small segment size caused by the attempted linux fix."

This reverts commit b278be79b42f5d8061014c756e802a1465568b96.
Made building sprites actually able to use the new special building props
merged in changes
Finished up the well framework, added well sprites.
Made farms work.

Farm plots have the plants shown as part of the building, rather than
actually as plants. this is both simpler to do, and allows for differing
sprites.
Merge branch 'master' of https://github.com/Caldfir/stonesense

Conflicts:
	Tile.cpp
Made farm plots and stockpiles have actual extents.