Merge branch 'oliviervanroey-master' into faandg_branch
Added Character links
Merge branch 'faandg_branch'