Added planet protection and planet tracking. A /who'ish command called /planet for players on your current planet.
Merge remote-tracking branch 'origin/master'

Conflicts:
	plugins/admin_commands_plugin/admin_command_plugin.py
fixes minor display bug on /promote

Conflicts:
	plugins/admin_commands_plugin/admin_command_plugin.py
adds a feedback chat message for affected player
Merge pull request #22 from MrMarvin/managing_merge_mess

Managing merge mess