Refactored the popup menu code to only occur once. Reflected changes in BoardTest
Merging wonders into board test. One test fails due to not fully implemented wonders and people in getMarker method of marker.