various changes on actuarial desktops
merge conflict in .bashrc resolved