first step requirement
Merge branch 'master' of https://github.com/judos/fisk.git
requirements on the way
Merge branch 'master' of https://github.com/judos/fisk.git
Merge branch 'master' of https://github.com/judos/fisk.git
~ Requirements

Merge branch 'master' of https://github.com/judos/fisk.git

Conflicts:
	WEB-INF/src/model/buildings/AntimonyMine.java
	WEB-INF/src/model/buildings/Biosphere.java
	WEB-INF/src/model/buildings/Labor.java
	WEB-INF/src/model/buildings/MetalMine.java