Merge branch 'release/v0.6.5' into develop
Merge branch 'hotfix/Julian_in_credits' into develop
Merge commit 'bc79a774087aa0b89023fa8ff5fdb08289fdf5ee' into develop
more ignoring
creep spawning is now defined in waves in the mission.inis; each wave creates new spawn points, these could in theory be at any position on the map; a delay at the beginning of each wave is set in the mission.ini but is not yet implemented.
Rebalancing the game will be necessary now as later waves can easily be fought off with the infrastructure built during the first wave.
Merge branch 'master' into develop

Conflicts:
	.gitignore
Merge branch 'develop' into origin/feature/issue/#63
missing commas
slightly modified difficulty setting
making rocks unbreakable as workaround for issue #114 for now.

Conflicts:
	love2d/game.lua
giving the player some mass at the start so he can build some towers
fiddling around a bit with the values
added some siren music to the intro
finally found the culprit
used some water
Merge branch 'develop' into feature/issue/#84_Tutorial_level

Conflicts:
	love2d/data/map/tutorial1.ini
some initial tutorial level layout
Setting custom mass and energy for each wave after the first one works now. The resource values for the first wave (= the starting values) must be set in the map file.
Merge branch 'origin/feature/issue/#63' into feature/issue/#84_Tutorial_level

Conflicts:
	love2d/data/map/tutorial1.ini
first two waves do what I want them to, for now