Upgrade

Added in there : 
- A merge with your branch
- a linkCount based on number of links for an HistoricalAgent/Concept before loading