Modified territory migration file, removed not null constraint
log stats
added location and log actions to controller
added stats and log actions to controller
added stats and log actions to controller
added create and join modal
Merge branch 'vandiggelenj_sprint2' into develop
node color changes
Merge branch 'zsbxt9_sprint2' into develop

Conflicts:
	css/risk.css
added modal footer
Added some dummy user data and methods to the game model for use in the UI controller.
Merge branch 'develop' into ahnera_sprint2
Fixed userinfo controller bug for the layout.
Dropdown list for army placement
Merge branch 'develop' into bdbtzc_sprint2
Javascript for on change of dropdown
Modified config.
Update users.json file.
Added primary key to territory_edge_assignment table.
Fixed placearmies ajax call.