Merge branch 'integration' of https://github.com/nwcaldwell/Java into integration
Fixed null pointer errsors in tile pdlacement rules
Merge branch 'integration' of https://github.com/nwcaldwell/Java into integration

Conflicts:
	src/view/commands/gameplayInput/MoveTileInputCommand.java
	src/view/screens/gameplay/PlanningView.java
	src/view/screens/gameplay/PlayView.java