/pvp command added

/pvp imperial or /pvp rebel to claim a faction for now. (will be removed
when NPCs in)
Merge pull request #17 from Waverunner/updates

/pvp command added
Added in custom admin commands
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/services/SimulationService.java