Fixes to SoldierDiaryOverviewState and Master Merge

Fix crash when selecting mission in records after scrolling down list for soldiers with more than 15 missions, Make diary mission list maintain position after viewing a mission log and merge with latest master.

Recreated pull request on new branch for better commit flow.