Dodanie statków.
merge lukier
Merge branch 'master' of https://github.com/arap/Chip-Totality

Conflicts:
	ChipTotality-android/assets/TestBuilding1.png
	ChipTotality-desktop/src/com/main/Main.java
	ChipTotality/src/com/gameInfo/GameStateHolder.java
	ChipTotality/src/com/main/Settings.java
	ChipTotality/src/com/res/Loader.java
	ChipTotality/src/com/screen/GUI/GameScreenGUI.java
	ChipTotality/src/com/screen/GameScreen.java
	ChipTotality/src/com/screen/controller/GameController.java
	ChipTotality/src/com/world/Asteroid.java
	ChipTotality/src/com/world/Tile.java
	ChipTotality/src/com/world/building/AcodinMine.java
	ChipTotality/src/com/world/building/Base.java
	ChipTotality/src/com/world/building/Building.java
	ChipTotality/src/com/world/building/HolyMountains.java
	ChipTotality/src/com/world/building/Rafinery.java
	ChipTotality/src/com/world/building/Temple.java