Added ability to merge settlements
Merge branch 'game_dev' of https://github.com/tsun1215/ap_bio_evo_game into game_dev