Merge branch 'master' of https://github.com/Mkossmeier/metaviz

# Conflicts:
#	cran-comments.md