Fixed PlayerId issued

Basically renamed playerId to peerId, then fixed problems that arose
from that.
Finalized attribute
Compile bug fix...
Merge branch 'dev' into #113-Spectator-Being-Assigned-Ids

Conflicts:
	src/common/controllers/NetworkController.java
	src/server/controllers/Server.java
Update Client UML
Merge branch 'dev' into #113-Spectator-Being-Assigned-Ids

Conflicts:
	src/common/controllers/NetworkController.java
	src/server/controllers/Server.java
Fix merge conflict
Merge pull request #147 from oharaandrew314/#113-Spectator-Being-Assigned-Ids

Fixed PlayerId issue