Merge remote-tracking branch 'upstream/master' into chain_notification_windows
Updating libs
Merge remote-tracking branch 'upstream/master' into chain_notification_windows
show allocate research button even when no new research is available
Merge branch 'chain_notification_windows' into testing