Added chart(loc, loc) and chart(str, str)
Merge branch 'master' of https://github.com/cwi-swat/rascal.git