Swarm

Signed-off-by: Sondre <Sondre@129.241.103.67>
Merge remote-tracking branch 'origin/master'

Conflicts:
	project.properties

Signed-off-by: Sondre <Sondre@129.241.103.67>