Planeta
Merge remote-tracking branch 'origin/master'

Conflicts:
	PlanetDefends/Library/CurrentLayout.dwlt
Merge branch 'master' of https://github.com/Izhmael/PlanetDefense

Conflicts:
	PlanetDefends/Library/CurrentLayout.dwlt
	PlanetDefends/PlanetDefends.userprefs