src folder:
added some JavaDocs to many of the java classes.
Removed miscleanous space lines and formated code.
Abstracted methods in Command class.
Cleared up Player object int-String ambiguity.
 web folder:
 Abstracted out angular controllers into new controller directory.
 Removed unnecessary semicolons.
  Initialized variables.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/java/game/logic/Command.java
	src/java/game/objects/Country.java
	src/java/game/objects/Game.java
	src/java/game/objects/Player.java
	src/java/game/objects/PlayerList.java
	src/java/game/objects/exceptions/CommandException.java
	src/java/game/objects/temptemp.java
	src/java/game/server/GameServlet.java
	web/html/game-lobby.html
	web/html/left-box.html
	web/index.html
	web/js/application.js
	web/js/d3-map.js